Mbed Development branch for MeasrueWare

Revision:
48:5731f1aa2c5a
Parent:
45:f5f553b8c0d5
Child:
56:38b36e947602
--- a/thermocouple_typeK_cjc0_config.c	Thu Feb 06 00:29:29 2020 +0000
+++ b/thermocouple_typeK_cjc0_config.c	Thu Feb 06 11:01:37 2020 +0000
@@ -54,11 +54,11 @@
             .powerMode = ADMW1001_POWER_MODE_ACTIVE,
         },
         .measurement = {
-            .externalRefVoltage=0.0,
+            .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!!
-            .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,                
-            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,               
+            .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
+            .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
+            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
             .cycleInterval = 0,
             .vBiasEnable = true,
             .RSenseValue = 1000.0,
@@ -74,23 +74,17 @@
                 .disablePublishing = false,
                 .compensationChannel = ADMW1001_CH_ID_NONE,
                 .lutSelect = ADMW1001_LUT_DEFAULT,
-                .measurementUnit = ADMW1001_MEASUREMENT_UNIT_CELSIUS,
-                .lowThreshold = -50,
-                .highThreshold = 250,
-                .offsetAdjustment = 0.0,
-                .gainAdjustment = 0.0,
-                .sensorParameter = 0.0,
+                .measurementUnit = ADMW1001_MEASUREMENT_UNIT_UNSPECIFIED,
+                .lowThreshold = 0,
+                .highThreshold = 45359.2,
                 .measurementsPerCycle = 1,
-                .cycleSkipCount = 0,
-                .extraSettlingTime = 0,
-                .priority = 0,
                 .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,
+                        .diodeRatio = (ADMW1001_ADC_EXC_CURRENT_DIODE_RATIO)0,
                     },
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,
@@ -115,21 +109,21 @@
                 .sensorParameter = 0.0,
                 .measurementsPerCycle = 1,
                 .cycleSkipCount = 0,
-                .extraSettlingTime = 5,
-                .priority = 0,
+                .extraSettlingTime = 0,
+                .priority = ADMW1001_CHANNEL_PRIORITY_0,
                 .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,
+                        .diodeRatio = (ADMW1001_ADC_EXC_CURRENT_DIODE_RATIO)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,
@@ -137,5 +131,4 @@
             },
         },
     },
-};
-
+};
\ No newline at end of file