Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 37:6acfbb4405cd, committed 2019-11-21
- Comitter:
- Vkadaba
- Date:
- Thu Nov 21 09:26:54 2019 +0000
- Parent:
- 36:54e2418e7620
- Child:
- 38:7604d3b44dd5
- Commit message:
- Config files updated
Changed in this revision
--- a/main.cpp Tue Nov 19 12:10:45 2019 +0000 +++ b/main.cpp Thu Nov 21 09:26:54 2019 +0000 @@ -57,7 +57,7 @@ extern ADMW_CONFIG multichannel_singlecycle_config; extern ADMW_CONFIG i2c0_sensirionSHT3X_config; /* Change the following pointer to select any of the configurations above */ -static ADMW_CONFIG *pSelectedConfig = &thermocouple_typeK_cjc0_config; +static ADMW_CONFIG *pSelectedConfig = &rtd_4w_config; static ADMW_CONNECTION connectionInfo = PLATFORM_CONNECTION_INFO;
--- a/multichannel_continuous_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/multichannel_continuous_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -49,10 +49,12 @@
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage=0.0,
.operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
.dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
.cycleInterval = 0,
.vBiasEnable = true,
+ .RSenseValue = 1000.0,
},
.diagnostics = {
.disableGlobalDiag = true,
@@ -65,9 +67,9 @@
.disablePublishing = false,
.compensationChannel = ADMW1001_CH_ID_NONE,
.lutSelect = ADMW1001_LUT_DEFAULT,
- .measurementUnit = ADMW1001_MEASUREMENT_UNIT_FAHRENHEIT,
- .lowThreshold = -58,
- .highThreshold = 482,
+ .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
+ .lowThreshold = -50,
+ .highThreshold = 250,
.offsetAdjustment = 0.0,
.gainAdjustment = 0.0,
.sensorParameter = 0.0,
@@ -92,6 +94,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
@@ -99,9 +102,9 @@
.disablePublishing = false,
.compensationChannel = ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
.lutSelect = ADMW1001_LUT_DEFAULT,
- .measurementUnit = ADMW1001_MEASUREMENT_UNIT_FAHRENHEIT,
- .lowThreshold = -58,
- .highThreshold = 482,
+ .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
+ .lowThreshold = -50,
+ .highThreshold = 250,
.offsetAdjustment = 0.0,
.gainAdjustment = 0.0,
.sensorParameter = 0.0,
@@ -115,7 +118,7 @@
.gain = ADMW1001_ADC_GAIN_8X,
.current = {
.excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
- .outputLevel = ADMW1001_ADC_EXC_CURRENT_EXTERNAL,
+ .outputLevel = ADMW1001_ADC_NO_EXTERNAL_EXC_CURRENT,
.diodeRatio = 0,
},
.filter = {
@@ -126,6 +129,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_DIG_I2C_0] = {
--- a/multichannel_singlecycle_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/multichannel_singlecycle_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -42,110 +42,107 @@
#include "admw_config_types.h"
ADMW_CONFIG multichannel_singlecycle_config = {
- .versionId = { .major = 2, .minor = 0 },
+ .versionId = { .major = 2, .minor = 0 },
.productId = ADMW_PRODUCT_ID_ADMW1001,
.admw1001 = {
.power = {
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage=0.0,
.operatingMode = ADMW1001_OPERATING_MODE_SINGLECYCLE,
- .dataReadyMode = ADMW1001_DATAREADY_PER_CONVERSION,
+ .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
+ .cycleInterval = 0,
+ .vBiasEnable = true,
+ .RSenseValue = 1000.0,
+ },
+ .diagnostics = {
+ .disableGlobalDiag = true,
+ .disableMeasurementDiag = true,
+ .osdFrequency = ADMW1001_OPEN_SENSOR_DIAGNOSTICS_DISABLED,
},
.channels = {
[ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {
.enableChannel = true,
.disablePublishing = false,
.compensationChannel = ADMW1001_CH_ID_NONE,
+ .lutSelect = ADMW1001_LUT_DEFAULT,
.measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
- .measurementsPerCycle = 10,
+ .lowThreshold = -50,
+ .highThreshold = 250,
+ .offsetAdjustment = 0.0,
+ .gainAdjustment = 0.0,
+ .sensorParameter = 0.0,
+ .measurementsPerCycle = 1,
+ .cycleSkipCount = 0,
.extraSettlingTime = 0,
+ .priority = 0,
.adcChannelConfig = {
.sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
- .gain = ADMW1001_ADC_GAIN_8X,
+ .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
+ .gain = ADMW1001_ADC_GAIN_1X,
.current = {
- .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
+ .excitationState= ADMW1001_ADC_EXC_STATE_ALWAYS_ON,
+ .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
+ .diodeRatio = 0,
},
.filter = {
.type = ADMW1001_ADC_FILTER_SINC3,
- },
- .reference = {
- ADMW1001_ADC_REFERENCE_VOLTAGE_AVDD,
+ .sf = ADMW1001_SF_8P24HZ,
+ .chopMode = ADMW1001_CHOP_MD_SW,
+ .notch1p2 = false,
+ .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
- },
- },
- [ADMW1001_CH_ID_ANLG_2_UNIVERSAL] = {
- .enableChannel = true,
- .disablePublishing = false,
- .compensationChannel = ADMW1001_CH_ID_NONE,
- .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
- .measurementsPerCycle = 10,
- .extraSettlingTime = 0,
- .adcChannelConfig = {
- .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
- .gain = ADMW1001_ADC_GAIN_8X,
- .current = {
- .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
- },
- .filter = {
- .type = ADMW1001_ADC_FILTER_SINC3,
- },
- .reference = {
- ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
- },
+ .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
.enableChannel = true,
.disablePublishing = false,
- .compensationChannel = ADMW1001_CH_ID_NONE,
+ .compensationChannel = ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
+ .lutSelect = ADMW1001_LUT_DEFAULT,
.measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
- .measurementsPerCycle = 10,
- .extraSettlingTime = 0,
+ .lowThreshold = -50,
+ .highThreshold = 250,
+ .offsetAdjustment = 0.0,
+ .gainAdjustment = 0.0,
+ .sensorParameter = 0.0,
+ .measurementsPerCycle = 1,
+ .cycleSkipCount = 0,
+ .extraSettlingTime = 4499.99986449257,
+ .priority = 0,
.adcChannelConfig = {
- .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
+ .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
+ .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
.gain = ADMW1001_ADC_GAIN_8X,
.current = {
- .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
+ .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
+ .outputLevel = ADMW1001_ADC_NO_EXTERNAL_EXC_CURRENT,
+ .diodeRatio = 0,
},
.filter = {
.type = ADMW1001_ADC_FILTER_SINC3,
- },
- .reference = {
- ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .sf = ADMW1001_SF_8P24HZ,
+ .chopMode = ADMW1001_CHOP_MD_SW,
+ .notch1p2 = false,
+ .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
- },
- },
- [ADMW1001_CH_ID_ANLG_2_DIFFERENTIAL] = {
- .enableChannel = true,
- .disablePublishing = false,
- .compensationChannel = ADMW1001_CH_ID_ANLG_2_UNIVERSAL,
- .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
- .measurementsPerCycle = 10,
- .extraSettlingTime = 0,
- .adcChannelConfig = {
- .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
- .gain = ADMW1001_ADC_GAIN_32X,
- .filter = {
- .type = ADMW1001_ADC_FILTER_SINC3,
- },
- .reference = {
- ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
- },
+ .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_DIG_I2C_0] = {
.enableChannel = true,
.disablePublishing = false,
.compensationChannel = ADMW1001_CH_ID_NONE,
- .measurementsPerCycle = 10,
- .extraSettlingTime = 36500,
+ .measurementsPerCycle = 1,
+ .extraSettlingTime = 15000,
.i2cChannelConfig = {
- .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_A,
- .deviceAddress = 0x27,
+ .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
+ .deviceAddress = 0x44,
},
},
},
},
-};
-
+};
\ No newline at end of file
--- a/rtd_3w_pt100_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/rtd_3w_pt100_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -43,17 +43,19 @@
#include "admw_config_types.h"
ADMW_CONFIG rtd_3w_pt100_config = {
- .versionId = { .major = 2, .minor = 0 },
+ .versionId = { .major = 2, .minor = 0 },
.productId = ADMW_PRODUCT_ID_ADMW1001,
.admw1001 = {
.power = {
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage =0.0,
.operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
.dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
.cycleInterval = 0,
.vBiasEnable = false,
+ .RSenseValue = 1000.0,
},
.diagnostics = {
.disableGlobalDiag = true,
@@ -97,4 +99,4 @@
},
},
},
-};
+};
\ No newline at end of file
--- a/rtd_4w_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/rtd_4w_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -43,16 +43,18 @@
#include "admw_config_types.h"
ADMW_CONFIG rtd_4w_config = {
- .versionId = { .major = 2, .minor = 0 },
+ .versionId = { .major = 2, .minor = 0 },
.productId = ADMW_PRODUCT_ID_ADMW1001,
.admw1001 = {
.power = {
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage = 0.0,
.operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
.dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
.cycleInterval = 0,
+ .RSenseValue = 1000.0,
},
.diagnostics = {
.disableGlobalDiag = true,
@@ -92,6 +94,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
},
--- a/thermocouple_typeJ_cjc0_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/thermocouple_typeJ_cjc0_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -52,9 +52,11 @@
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage = 0.0,
.operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
.dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
.cycleInterval = 0,
+ .RSenseValue = 1000.0,
},
.diagnostics = {
.disableGlobalDiag = true,
@@ -94,6 +96,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
@@ -122,6 +125,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
},
--- a/thermocouple_typeT_cjc0_config.c Tue Nov 19 12:10:45 2019 +0000
+++ b/thermocouple_typeT_cjc0_config.c Thu Nov 21 09:26:54 2019 +0000
@@ -49,9 +49,11 @@
.powerMode = ADMW1001_POWER_MODE_ACTIVE,
},
.measurement = {
+ .externalRefVoltage = 0.0,
.operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
.dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
.cycleInterval = 0,
+ .RSenseValue = 1000.0,
},
.diagnostics = {
.disableGlobalDiag = true,
@@ -91,6 +93,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
[ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
@@ -119,6 +122,7 @@
.groundSwitch = ADMW1001_ADC_GND_SW_OPEN
},
.reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+ .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
},
},
},