Diff: main.cpp

Revision:

12:5de5f550e765

Parent:

11:640cced1ee5d

Child:

13:5ce84c68066e

--- a/main.cpp	Tue Jun 19 12:58:45 2018 +0000
+++ b/main.cpp	Thu Jun 21 14:58:46 2018 +0000
@@ -21,9 +21,9 @@
 //USER CONFIGURABLE*********
 bool mode = 1; //0 for PS_LS, 1 for PPG
 bool meas_ps = 1;
-bool spo2 = 0; //0 for HR, 1 for SpO2
+bool spo2 = 1; //0 for HR, 1 for SpO2
 bool afull = 1; //use Afull interrupt--otherwise PPG new data interrupt
-bool meas_temp = 0;
+bool meas_temp = 1;
 //****************************
 
 //internal settings
@@ -36,8 +36,8 @@
     
     meas_temp ? ob1203.temp_en = TEMP_ON : ob1203.temp_en = TEMP_OFF;
 
-    ob1203.ls_res = LS_RES(0); //2= 18bit 100ms, 0= max res
-    ob1203.ls_rate = LS_RATE(4); //2 =100ms, 4 = 500ms
+    ob1203.ls_res = LS_RES(2); //2= 18bit 100ms, 0= max res
+    ob1203.ls_rate = LS_RATE(2); //2 =100ms, 4 = 500ms
     ob1203.ls_gain = LS_GAIN(3); //gain 3 default (range)
     ob1203.ls_thres_hi = 0x000FFFFF;
     ob1203.ls_thres_lo = 0;
@@ -63,12 +63,12 @@
     {
         ob1203.ppg_ps_mode = PS_MODE;
     }
-    ob1203.ps_pulses = PS_PULSES(8);
+    ob1203.ps_pulses = PS_PULSES(3);
 //    pc.printf("ps_pulses = %02X\r\n",ob1203.ps_pulses);
     ob1203.ps_pwidth = PS_PWIDTH(1);
     ob1203.ps_rate = PS_RATE(4);
 //    pc.printf("ps_rate = %02X\r\n",ob1203.ps_rate);
-    ob1203.ps_avg_en = PS_AVG_ON;
+    ob1203.ps_avg_en = PS_AVG_OFF;
     ob1203.ps_can_ana = PS_CAN_ANA_0;
     ob1203.ps_digital_can = 0;
     ob1203.ps_hys_level = 0;
@@ -117,11 +117,11 @@
     ob1203.led_flip = LED_FLIP_OFF;
     ob1203.ch1_can_ana = PPG_CH1_CAN(0);
     ob1203.ch2_can_ana = PPG_CH2_CAN(0);
-    ob1203.ppg_avg = PPG_AVG(0); //2^n
-    ob1203.ppg_rate = PPG_RATE(4);
-    ob1203.ppg_pwidth = PPG_PWIDTH(5);
-//    ob1203.ppg_freq = PPG_FREQ_50HZ;
-    ob1203.ppg_freq = PPG_FREQ_60HZ;
+    ob1203.ppg_avg = PPG_AVG(4); //2^n
+    ob1203.ppg_rate = PPG_RATE(1);
+    ob1203.ppg_pwidth = PPG_PWIDTH(3);
+    ob1203.ppg_freq = PPG_FREQ_50HZ;
+//    ob1203.ppg_freq = PPG_FREQ_60HZ;
     ob1203.bio_trim = 3; //max 3
     ob1203.led_trim = 0x00; //max current
     ob1203.ppg_LED_settling = PPG_LED_SETTLING(2);
@@ -379,8 +379,8 @@
                 {
                     ob1203.setMainConfig();
                 }
-//                pc.printf("%d %d %d %d %d %d\r\n",ps_ls_data[0],ps_ls_data[1],ps_ls_data[2],ps_ls_data[3],ps_ls_data[4],ps_ls_data[5]);
-                pc.printf("%d, %d %d %d %d %d %d %d\r\n",(PSavg/ps_running_avg),ps_ls_data[0],ps_ls_data[1],ps_ls_data[2],ps_ls_data[3],ps_ls_data[4],ps_ls_data[5],ps_ls_data[6]);
+                pc.printf("%d, %d %d %d %d %d\r\n",ps_ls_data[0],ps_ls_data[1],ps_ls_data[2],ps_ls_data[3],ps_ls_data[4],ps_ls_data[5]);
+//                pc.printf("%d, %d %d %d %d %d %d %d\r\n",(PSavg/ps_running_avg),ps_ls_data[0],ps_ls_data[1],ps_ls_data[2],ps_ls_data[3],ps_ls_data[4],ps_ls_data[5],ps_ls_data[6]);
             
             }
 //            else