Vybhav Kadaba / Mbed OS EV-PRO-MW1001_Development_v11775

Minor changes to support ADMW FWv1.17.75

Files at this revision

API Documentation at this revision

Revision 62:a5b88f433406, committed 2020-04-08

Comitter:
Vkadaba
Date:
Wed Apr 08 10:05:08 2020 +0000
Parent:
61:0f16a2e3b58b
Commit message:
Minor changes to support FW v1.17.75

Changed in this revision

bridge_4w_load_cell_config.c Show annotated file Show diff for this revision Revisions of this file
i2c0_sensirionSHT3X_config.c Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
multichannel_continuous_config.c Show annotated file Show diff for this revision Revisions of this file
multichannel_singlecycle_config.c Show annotated file Show diff for this revision Revisions of this file
rtd_3w_pt100_config.c Show annotated file Show diff for this revision Revisions of this file
rtd_4w_config.c Show annotated file Show diff for this revision Revisions of this file
src/mbed/admw_spi.cpp Show annotated file Show diff for this revision Revisions of this file
thermocouple_typeJ_cjc0_config.c Show annotated file Show diff for this revision Revisions of this file
thermocouple_typeK_cjc0_config.c Show annotated file Show diff for this revision Revisions of this file
thermocouple_typeT_cjc0_config.c Show annotated file Show diff for this revision Revisions of this file 
--- a/bridge_4w_load_cell_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/bridge_4w_load_cell_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -59,6 +59,7 @@
             .vBiasEnable = false,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_CLOSED,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/i2c0_sensirionSHT3X_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/i2c0_sensirionSHT3X_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -52,10 +52,11 @@
         .measurement = {
             .externalRefVoltage=0.0,
             .AVDDVoltage=3.0,
-            .operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
+            .operatingMode = ADMW1001_OPERATING_MODE_SINGLECYCLE,
             .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
             .cycleInterval = 0,
             .excitationState = ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_DIG_I2C_0] = {

--- a/main.cpp	Tue Mar 31 04:50:37 2020 +0000
+++ b/main.cpp	Wed Apr 08 10:05:08 2020 +0000
@@ -65,7 +65,7 @@
 extern ADMW_CONFIG measureware_config;
 
 /* Change the following pointer to load or change the configurations  */
-static ADMW_CONFIG *pSelectedConfig = &thermocouple_typeK_cjc0_config;
+static ADMW_CONFIG *pSelectedConfig = &multichannel_continuous_config;
 
 /* use the following to load LUT */
 extern ADMW1001_LUT_DESCRIPTOR *lut_desc_list[];

--- a/multichannel_continuous_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/multichannel_continuous_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -58,6 +58,7 @@
             .vBiasEnable = true,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/multichannel_singlecycle_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/multichannel_singlecycle_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -58,6 +58,7 @@
             .vBiasEnable = true,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/rtd_3w_pt100_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/rtd_3w_pt100_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -59,6 +59,7 @@
             .vBiasEnable = false,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/rtd_4w_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/rtd_4w_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -59,6 +59,7 @@
             .vBiasEnable = false,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/src/mbed/admw_spi.cpp	Tue Mar 31 04:50:37 2020 +0000
+++ b/src/mbed/admw_spi.cpp	Wed Apr 08 10:05:08 2020 +0000
@@ -115,9 +115,10 @@
                      (char*)(pRxData), pRxData ? nLength : 0);
     
     if ((rc < 0) || !bCsHold)
-        *(pCtx->_cs) = 1;
-    
-       *(pCtx->_wakeup) = 0;
+    {
+       *(pCtx->_cs) = 1;
+    }
+    *(pCtx->_wakeup) = 0;
        
     if (rc < 0)
     {

--- a/thermocouple_typeJ_cjc0_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/thermocouple_typeJ_cjc0_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -61,6 +61,7 @@
             .vBiasEnable = true,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/thermocouple_typeK_cjc0_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/thermocouple_typeK_cjc0_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -63,6 +63,7 @@
             .vBiasEnable = true,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {

--- a/thermocouple_typeT_cjc0_config.c	Tue Mar 31 04:50:37 2020 +0000
+++ b/thermocouple_typeT_cjc0_config.c	Wed Apr 08 10:05:08 2020 +0000
@@ -58,6 +58,7 @@
             .vBiasEnable = true,
             .RSenseValue = 1000,
             .groundSwitch = ADMW1001_ADC_GND_SW_OPEN,
+            .fifoNumCycles = 1,
         },
         .channels = {
             [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {