Diff: main.cpp

Revision:

73:cae0c514bea6

Parent:

70:420fac5132f5

Child:

74:27a28f452d71

--- a/main.cpp	Fri Apr 24 06:37:01 2020 +0000
+++ b/main.cpp	Fri Apr 24 11:51:13 2020 +0000
@@ -52,18 +52,13 @@
 #include "admw1001/admw1001_host_comms.h"
 #include "mbedVersion.h"
 
-extern ADMW_CONFIG thermocouple_typeK_cjc0_config;
-extern ADMW_CONFIG thermocouple_typeT_cjc0_config;
-extern ADMW_CONFIG thermocouple_typeJ_cjc0_config;
-extern ADMW_CONFIG rtd_3w_pt100_config;
-extern ADMW_CONFIG rtd_4w_config;
-extern ADMW_CONFIG bridge_4w_load_cell_config;
-extern ADMW_CONFIG i2c0_sensirionSHT3X_config;
+
+extern ADMW_CONFIG default_config;
 /* Use the following config if adding a configuration file from measureware designer*/
 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 = &default_config;
 
 /* use the following to load LUT */
 extern ADMW1001_LUT_DESCRIPTOR *lut_desc_list[];
@@ -166,7 +161,18 @@
      * Kick off the measurement cycle here
      */
     ADMW_LOG_INFO("Configuration completed, starting measurement cycles");
-    utils_runMeasurement(hDevice, eMeasurementMode);
+  
+    bool b_serialInput = true;
+    
+    if(b_serialInput == true)
+    {
+        utils_runMeasurementsFromSerialPing(hDevice, eMeasurementMode);
+    } 
+    else 
+    {
+        utils_runMeasurement(hDevice, eMeasurementMode);
+    }
+    
 
     /*
      * Clean up and exit