Mbed Fw supporting Device FW v82.25

Revision:
22:2835e9e9f59f
Parent:
15:b5d57daeb7c0
Child:
23:bb685f35b08b
--- a/multichannel_continuous_config.c	Wed Sep 11 08:45:10 2019 +0000
+++ b/multichannel_continuous_config.c	Thu Sep 26 05:56:58 2019 +0000
@@ -45,110 +45,100 @@
     .versionId = { .major = 2, .minor = 0 },
     .productId = ADMW_PRODUCT_ID_ADMW1001,
     .admw1001 = {
-        .power = {
-            .powerMode = ADMW1001_POWER_MODE_ACTIVE,
-        },
-        .measurement = {
-            .operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
-            .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
-            .cycleInterval = 5000000,
-        },
-        .channels = {
-            [ADMW1001_CH_ID_ANLG_1_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,
+            .power = {
+                .powerMode = ADMW1001_POWER_MODE_ACTIVE,
+            },
+            .measurement = {
+                .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,
+            },
+            .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_FAHRENHEIT,
+                    .lowThreshold = -58,
+                    .highThreshold = 482,
+                    .offsetAdjustment = 0.0,
+                    .gainAdjustment = 0.0,
+                    .sensorParameter = 0.0,
+                    .measurementsPerCycle = 10,
+                    .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 = {
+                            .excitationState= ADMW1001_ADC_EXC_STATE_ALWAYS_ON,
+                            .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
+                            .diodeRatio = 0,
+                        },
+                        .filter = {
+                            .type = ADMW1001_ADC_FILTER_SINC3,
+                            .sf = ADMW1001_SF_8P24HZ,
+                            .chopMode = ADMW1001_CHOP_MD_SW,
+                            .notch1p2 = false,
+                            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
+                        },
+                        .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,
+                [ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
+                    .enableChannel = true,
+                    .disablePublishing = false,
+                    .compensationChannel = ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
+                    .lutSelect = ADMW1001_LUT_DEFAULT,
+                    .measurementUnit = ADMW1001_MEASUREMENT_UNIT_FAHRENHEIT,
+                    .lowThreshold = -58,
+                    .highThreshold = 482,
+                    .offsetAdjustment = 0.0,
+                    .gainAdjustment = 0.0,
+                    .sensorParameter = 0.0,
+                    .measurementsPerCycle = 10,
+                    .cycleSkipCount = 0,
+                    .extraSettlingTime = 4499.99986449257,
+                    .priority = 0,
+                    .adcChannelConfig = {
+                        .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
+                        .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
+                        .gain = ADMW1001_ADC_GAIN_8X,
+                        .current = {
+                            .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
+                            .outputLevel = ADMW1001_ADC_EXC_CURRENT_EXTERNAL,
+                            .diodeRatio = 0,
+                        },
+                        .filter = {
+                            .type = ADMW1001_ADC_FILTER_SINC3,
+                            .sf = ADMW1001_SF_8P24HZ,
+                            .chopMode = ADMW1001_CHOP_MD_SW,
+                            .notch1p2 = false,
+                            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
+                        },
+                        .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
                     },
-                    .filter = {
-                        .type = ADMW1001_ADC_FILTER_SINC3,
-                    },
-                    .reference = {
-                        ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
-
+                },
+                [ADMW1001_CH_ID_DIG_I2C_0] = {
+                    .enableChannel = true,
+                    .disablePublishing = false,
+                    .compensationChannel = ADMW1001_CH_ID_NONE,
+                    .measurementsPerCycle = 10,
+                    .extraSettlingTime = 15000,
+                    .i2cChannelConfig = {
+                        .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
+                        .deviceAddress = 0x44,
+                        },
                     },
                 },
             },
-            [ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
-                .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,
-
-                    },
-                },
-            },
-            [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,
-                    },
-                },
-            },
-            [ADMW1001_CH_ID_DIG_I2C_0] = {
-                .enableChannel = true,
-                .disablePublishing = false,
-                .compensationChannel = ADMW1001_CH_ID_NONE,
-                .measurementsPerCycle = 10,
-                .extraSettlingTime = 36500,
-                .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_A,
-                    .deviceAddress = 0x27,
-                },
-            },
-        },
-    },
-};
-
+};
\ No newline at end of file