Diff: multichannel_continuous_config.c

Revision:

8:2f2775c34640

Parent:

6:9d393a9677f4

--- a/multichannel_continuous_config.c	Tue Jun 18 09:28:16 2019 +0000
+++ b/multichannel_continuous_config.c	Thu Jun 20 18:13:57 2019 +0000
@@ -54,15 +54,36 @@
             .cycleInterval = 5000000,
         },
         .channels = {
-            [ADMW1001_CHANNEL_ID_ANALOG_1_UNIVERSAL] = {
+            [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {
                 .enableChannel = true,
                 .disablePublishing = false,
-                .compensationChannel = ADMW1001_CHANNEL_ID_NONE,
+                .compensationChannel = ADMW1001_CH_ID_NONE,
                 .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
                 .measurementsPerCycle = 10,
                 .extraSettlingTime = 0,
                 .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1,
+                    .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,
+                    },
+                },
+            },
+            [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,
@@ -71,43 +92,20 @@
                         .type = ADMW1001_ADC_FILTER_SINC3,
                     },
                     .reference = {
-                        .type = ADMW1001_ADC_REFERENCE_RESISTOR_INTERNAL_1,
+                        ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+
                     },
-                    .enableVbias = false,
                 },
             },
-            [ADMW1001_CHANNEL_ID_ANALOG_2_UNIVERSAL] = {
+            [ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
                 .enableChannel = true,
                 .disablePublishing = false,
-                .compensationChannel = ADMW1001_CHANNEL_ID_NONE,
+                .compensationChannel = ADMW1001_CH_ID_NONE,
                 .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
                 .measurementsPerCycle = 10,
                 .extraSettlingTime = 0,
                 .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1,
-                    .gain = ADMW1001_ADC_GAIN_8X,
-                    .current = {
-                        .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
-                    },
-                    .filter = {
-                        .type = ADMW1001_CHANNEL_ID_ANALOG_2_UNIVERSAL,
-                    },
-                    .reference = {
-                        .type = ADMW1001_ADC_REFERENCE_RESISTOR_INTERNAL_1,
-
-                    },
-                    .enableVbias = false,
-                },
-            },
-            [ADMW1001_CHANNEL_ID_ANALOG_1_DIFFERENTIAL] = {
-                .enableChannel = true,
-                .disablePublishing = false,
-                .compensationChannel = ADMW1001_CHANNEL_ID_NONE,
-                .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
-                .measurementsPerCycle = 10,
-                .extraSettlingTime = 0,
-                .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1,
+                    .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
                     .gain = ADMW1001_ADC_GAIN_8X,
                     .current = {
                         .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
@@ -116,39 +114,37 @@
                         .type = ADMW1001_ADC_FILTER_SINC3,
                     },
                     .reference = {
-                        .type = ADMW1001_ADC_REFERENCE_RESISTOR_INTERNAL_1,
+                        ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
 
                     },
-                    .enableVbias = false,
                 },
             },
-            [ADMW1001_CHANNEL_ID_ANALOG_2_DIFFERENTIAL] = {
+            [ADMW1001_CH_ID_ANLG_2_DIFFERENTIAL] = {
                 .enableChannel = true,
                 .disablePublishing = false,
-                .compensationChannel = ADMW1001_CHANNEL_ID_ANALOG_2_UNIVERSAL,
+                .compensationChannel = ADMW1001_CH_ID_ANLG_2_UNIVERSAL,
                 .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
                 .measurementsPerCycle = 10,
                 .extraSettlingTime = 0,
                 .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K_DEF_L1,
+                    .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
                     .gain = ADMW1001_ADC_GAIN_32X,
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,
                     },
                     .reference = {
-                        .type = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+                     ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
                     },
-                    .enableVbias = true,
                 },
             },
-            [ADMW1001_CHANNEL_ID_I2C_0] = {
+            [ADMW1001_CH_ID_DIG_I2C_0] = {
                 .enableChannel = true,
                 .disablePublishing = false,
-                .compensationChannel = ADMW1001_CHANNEL_ID_NONE,
+                .compensationChannel = ADMW1001_CH_ID_NONE,
                 .measurementsPerCycle = 10,
                 .extraSettlingTime = 36500,
                 .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_A_DEF_L1,
+                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_A,
                     .deviceAddress = 0x27,
                 },
             },