Added independent packet type check

Protocentral · Nov 7, 2024 · 00eb08f · 00eb08f
1 parent 2e59481
commit 00eb08f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/lib/plotSerial.dart b/lib/plotSerial.dart
@@ -142,6 +142,41 @@ class _PlotSerialPageState extends State<PlotSerialPage> {
               //print("packet length: " + CES_Pkt_Len.toString());
               //if(CES_Pkt_Len == 69){
               if (CES_Pkt_PktType == 4) {
+                for (int i = 0; i < 8; i++) {
+                  ces_pkt_ch3_buffer[0] = CES_Pkt_PPG_Data_Counter[(i * 2) ];
+                  ces_pkt_ch3_buffer[1] = CES_Pkt_PPG_Data_Counter[(i * 2) + 1];
+                  int data3 =
+                  ces_pkt_ch3_buffer[0] | ces_pkt_ch3_buffer[1] << 8;
+
+                  setStateIfMounted(() {
+                    ppgLineData
+                        .add(FlSpot(ppgDataCounter++, ((data3).toDouble())));
+                    if (startDataLogging == true) {
+                      ppgDataLog.add((data3.toSigned(16)).toDouble());
+                    }
+                  });
+                  if (ppgDataCounter >= 128 * 6) {
+                    ppgLineData.removeAt(0);
+                  }
+                }
+
+                setStateIfMounted(() {
+                  globalSpO2 = (CES_Pkt_PPG_Data_Counter[16]).toInt();
+                  if (globalSpO2 == 25) {
+                    displaySpO2 = "--";
+                  } else {
+                    displaySpO2 = globalSpO2.toString() + " %";
+                  }
+
+                  globalTemp = (((CES_Pkt_PPG_Data_Counter[17] |
+                  CES_Pkt_PPG_Data_Counter[18] << 8)
+                      .toInt()) /
+                      100.00)
+                      .toDouble();
+                });
+
+              }
+              if (CES_Pkt_PktType == 3) {
                 for (int i = 0; i < 8; i++) {
                   ces_pkt_ch1_buffer[0] =
                       CES_Pkt_ECG_RESP_Data_Counter[(i * 4)];
@@ -196,39 +231,9 @@ class _PlotSerialPageState extends State<PlotSerialPage> {
                   }
                 }
 
-                for (int i = 0; i < 8; i++) {
-                  ces_pkt_ch3_buffer[0] = CES_Pkt_PPG_Data_Counter[(i * 2) ];
-                  ces_pkt_ch3_buffer[1] = CES_Pkt_PPG_Data_Counter[(i * 2) + 1];
-                  int data3 =
-                  ces_pkt_ch3_buffer[0] | ces_pkt_ch3_buffer[1] << 8;
-
-                  setStateIfMounted(() {
-                    ppgLineData
-                        .add(FlSpot(ppgDataCounter++, ((data3).toDouble())));
-                    if (startDataLogging == true) {
-                      ppgDataLog.add((data3.toSigned(16)).toDouble());
-                    }
-                  });
-                  if (ppgDataCounter >= 128 * 6) {
-                    ppgLineData.removeAt(0);
-                  }
-                }
-
                 setStateIfMounted(() {
                   globalHeartRate = (CES_Pkt_ECG_RESP_Data_Counter[48]).toInt();
                   globalRespRate = (CES_Pkt_ECG_RESP_Data_Counter[49]).toInt();
-                  globalSpO2 = (CES_Pkt_PPG_Data_Counter[16]).toInt();
-                  if (globalSpO2 == 25) {
-                    displaySpO2 = "--";
-                  } else {
-                    displaySpO2 = globalSpO2.toString() + " %";
-                  }
-
-                  globalTemp = (((CES_Pkt_PPG_Data_Counter[17] |
-                  CES_Pkt_PPG_Data_Counter[18] << 8)
-                      .toInt()) /
-                      100.00)
-                      .toDouble();
                 });
               }
               //else if(CES_Pkt_Len == 20) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: OpenView2
 description: BLE companion app for use with ProtoCentral breakout boards and modules
 
-version: 2.0.39+109
+version: 2.0.40+110
 
 environment:
   sdk: ^3.3.0