Diff: multichannel_continuous_config.c

Revision:

56:38b36e947602

Parent:

45:f5f553b8c0d5

Child:

58:aa9cd5072f66

--- a/multichannel_continuous_config.c	Mon Feb 24 07:04:35 2020 +0000
+++ b/multichannel_continuous_config.c	Mon Feb 24 08:49:25 2020 +0000
@@ -42,7 +42,7 @@
 #include "admw_config_types.h"
 
 ADMW_CONFIG multichannel_continuous_config = {
-     .versionId = { .major = 2, .minor = 0 },
+    .versionId = { .major = 2, .minor = 0 },
     .productId = ADMW_PRODUCT_ID_ADMW1001,
     .admw1001 = {
         .power = {
@@ -50,20 +50,14 @@
         },
         .measurement = {
             .externalRefVoltage=0.0,
+            .AVDDVoltage=3.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!!
-            .excitationState= ADMW1001_ADC_EXC_STATE_ALWAYS_ON,                
-            .groundSwitch = ADMW1001_ADC_GND_SW_CLOSED,             
-            .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,                
-            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,              
+            .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
             .cycleInterval = 0,
+            .excitationState = ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
             .vBiasEnable = true,
-            .RSenseValue = 1000.0,          
-        },
-        .diagnostics = {
-            .disableGlobalDiag = true,
-            .disableMeasurementDiag = true,
-            .osdFrequency = 0,
+            .RSenseValue = 1000,
+            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {
@@ -72,28 +66,24 @@
                 .compensationChannel = ADMW1001_CH_ID_NONE,
                 .lutSelect = ADMW1001_LUT_DEFAULT,
                 .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
+                .extraSettlingTime = 0,
                 .lowThreshold = -50,
                 .highThreshold = 250,
-                .offsetAdjustment = 0.0,
-                .gainAdjustment = 0.0,
-                .sensorParameter = 0.0,
                 .measurementsPerCycle = 1,
-                .cycleSkipCount = 0,
-                .extraSettlingTime = 0,
-                .priority = 0,
+                .offsetAdjustment = 0,
+                .gainAdjustment = 1,
                 .adcChannelConfig = {
                     .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
-                    .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
                     .gain = ADMW1001_ADC_GAIN_1X,
                     .current = {
-                        .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
-                        .diodeRatio = 0,
+                        .outputLevel = ADMW1001_ADC_EXC_CURRENT_500uA,
                     },
+                    .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,
                         .sf = ADMW1001_SF_8P24HZ,
                         .chopMode = ADMW1001_CHOP_MD_SW,
-                        .notch1p2 = false,
+                        .notch1p2 = true
                     },
                     .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
                     .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
@@ -105,44 +95,36 @@
                 .compensationChannel = ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
                 .lutSelect = ADMW1001_LUT_DEFAULT,
                 .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
+                .extraSettlingTime = 4.49999986449257,
                 .lowThreshold = -50,
                 .highThreshold = 250,
-                .offsetAdjustment = 0.0,
-                .gainAdjustment = 0.0,
-                .sensorParameter = 0.0,
                 .measurementsPerCycle = 1,
-                .cycleSkipCount = 0,
-                .extraSettlingTime = 4499.99986449257,
-                .priority = 0,
+                .offsetAdjustment = 0,
+                .gainAdjustment = 1,
                 .adcChannelConfig = {
                     .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
-                    .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
                     .gain = ADMW1001_ADC_GAIN_8X,
-                    .current = {
-                        .outputLevel = ADMW1001_ADC_NO_EXTERNAL_EXC_CURRENT,
-                        .diodeRatio = 0,
-                    },
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,
                         .sf = ADMW1001_SF_8P24HZ,
                         .chopMode = ADMW1001_CHOP_MD_SW,
-                        .notch1p2 = false,
+                        .notch1p2 = true
                     },
                     .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
                     .bufferBypass = ADMW1001_BUFFER_BYPASSS_DISABLED,
                 },
             },
             [ADMW1001_CH_ID_DIG_I2C_0] = {
-                .enableChannel = false,
+                .enableChannel = true,
                 .disablePublishing = false,
                 .compensationChannel = ADMW1001_CH_ID_NONE,
+                .measurementUnit = ADMW1001_MEASUREMENT_UNIT_UNSPECIFIED,
                 .measurementsPerCycle = 1,
-                .extraSettlingTime = 15000,
+                .extraSettlingTime = 99.5000014663674,
                 .i2cChannelConfig = {
                     .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
-                    .deviceAddress = 0x44,
                 },
-            },
+            }
         },
     },
 };
\ No newline at end of file