Diff: main.cpp

Revision:

53:034f646141ae

Parent:

52:e5aba237e804

Child:

54:2f19a5a83a62

--- a/main.cpp	Wed May 11 22:55:14 2022 +0000
+++ b/main.cpp	Thu May 12 22:20:46 2022 +0000
@@ -37,7 +37,7 @@
 /******************************************************************************
 * https://os.mbed.com/users/phonemacro/code/MAX32664C_Example_Host_Code
 * Tera Term output is set to 115200 baud rate.
-* ver: 220511
+* ver: 220512
 ******************************************************************************/
 
 /******************************************************************************
@@ -51,9 +51,9 @@
 
 /*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*/
 // define one and only one of the following three platforms
-//#define MAXM86146_CFG 1  // tested on MAXM86146EVSYS_sensorBrd+MAXM86161_ADAPTER_REVB+MAX32630FTHR 33.13.12
+#define MAXM86146_CFG 1  // tested on MAXM86146EVSYS_sensorBrd+MAXM86161_ADAPTER_REVB+MAX32630FTHR 33.13.12
 //#define MAXREFDES103_CFG  // not tested
-#define MAXM86161_CFG 1  // tested on MAXM86161+MAX32630FTHR v32.9.22, 32.13.12
+//#define MAXM86161_CFG 1  // tested on MAXM86161+MAX32630FTHR v32.9.22, 32.13.12
 /*****************************************************************************/
 
 /*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*/
@@ -92,7 +92,7 @@
   //#define RAW_HZ 100   // Raw data rate
   //#define RAW_HZ 200   // Raw data rate
   //#define RAW_HZ 2004   // Raw data rate 200 Hz, ave 4
-#define SPO2_CAL_RPT 1
+//#define SPO2_CAL_RPT 1
 
 // Comment out both of the below for Normal Algorithm Samples Format
 //#define EXTENDED_ALGO 1  // define this if you want the extended algo samples report format 
@@ -332,7 +332,7 @@
 
             spo2 = (rsp[ptr+44] << 8) + rsp[ptr+45];
             spo2_compl = rsp[ptr+46];
-            spo2_lo = rsp[ptr+47];
+            spo2_lo = rsp[ptr+47];  // low quality
             spo2_mo = rsp[ptr+48];
 
             spo2_lopi = rsp[ptr+49];
@@ -369,13 +369,13 @@
             if (heading_printed == 0) {
                 heading_printed = 1;
 #if defined(ALGO_ONLY)
-                pc.printf("hr,hr_conf,spo2,spo2_conf,spo2_lo,spo2_unrel,scd,\n\r");
+                pc.printf("hr,r,hr_conf,spo2,spo2_conf,spo2_lo,spo2_unrel,spo2_state,scd,\n\r");
 #endif
             }
             pc.printf("%d,%d,%d", hr, hr_conf, r);
             pc.printf("%d,%d,", spo2, spo2_conf);
             pc.printf("%d,%d,%d,", spo2_lo, spo2_mo, spo2_lopi);
-            pc.printf("%d,%d,", spo2_unrel, scd);
+            pc.printf("%d,%d,%d,", spo2_unrel,spo2_state, scd);
 #endif  // if 1
 #elif defined(PACKED_NORMAL_ALGO)
 //            pc.printf("ptr %d ttlsiz %d ", ptr, TTL_SZ);
@@ -438,13 +438,13 @@
             if (heading_printed == 0) {
                 heading_printed = 1;
      #if defined(ALGO_ONLY)
-                pc.printf("hr,hr_conf,r,spo2,spo2_conf,spo2_lo,spo2_unrel,scd,\n\r");
+                pc.printf("hr,hr_conf,r,spo2,spo2_conf,spo2_lo,spo2_unrel,spo2_state,scd,\n\r");
      #endif
             }
             pc.printf("%d,%d,%d", hr, hr_conf, r);
             pc.printf("%d,%d,", spo2, spo2_conf);
             pc.printf("%d,", spo2_lo);
-            pc.printf("%d,%d,", spo2_unrel, scd);
+            pc.printf("%d,%d,%d,%d", spo2_lopi,spo2_unrel, spo2_state, scd);
   #endif
 #endif // #if defined(PCK_CFG_MASK)
 
@@ -490,13 +490,13 @@
             if (heading_printed == 0) {
                 heading_printed = 1;
 #if defined(ALGO_ONLY)
-                pc.printf("hr,hr_conf,r, spo2,spo2_conf,spo2_lo,spo2_unrel,scd,\n\r");
+                pc.printf("hr,hr_conf,r,spo2,spo2_conf,spo2_lo,spo2_unrel,spo2_state,scd,\n\r");
 #endif
             }
             pc.printf("%d,%d,%d,", hr, hr_conf, r);
             pc.printf("%d,%d,", spo2, spo2_conf);
             pc.printf("%d,", spo2_lo);
-            pc.printf("%d,%d,", spo2_unrel, scd);
+            pc.printf("%d,%d,%d,%d,", spo2_lopi,spo2_unrel,spo2_state, scd);
 #endif
 #endif  // end normal algo size
 #endif // !RAW