Diff: main.cpp

Revision:

34:1d3818f8c1a1

Parent:

33:3fad9e7238a4

Child:

35:daf134714cee

--- a/main.cpp	Wed Mar 13 20:05:54 2019 +0000
+++ b/main.cpp	Thu Mar 14 14:19:14 2019 +0000
@@ -34,6 +34,7 @@
 int countdown = cw;
 bool countdown1_triggered = false, countdown2_triggered = false;
 bool step_in = false, step_out = false;
+bool range1_just_triggered = false, range2_just_triggered = false;
  
 const static char     DEVICE_NAME[]        = "OCCUPY-CRICHTON-ST"; 
 static const uint16_t uuid16_list[]        = {GattService::UUID_HEART_RATE_SERVICE};
@@ -115,20 +116,23 @@
             if (!countdown1_triggered && !countdown2_triggered) {
                 countdown1_triggered = true;
                 countdown = cw;
-            } else if (countdown2_triggered) {
+            } else if (countdown2_triggered && !range1_just_triggered) {
                 printf("STEP IN DETECTED\n");
                 hrmCounter = 1;
                 hrService->updateHeartRate(hrmCounter);
                 countdown2_triggered = false;
             }
+            
+            range1_just_triggered = true;
         }
         else {
             led1 = 1;
+            range1_just_triggered = false;
         }
     } else {
-        printf("Range1 [mm]:                --\r\n");
+//        printf("Range1 [mm]:                --\r\n");
         led1 = 1;
-        
+        range2_just_triggered = false;
     }
     if (status2 == VL53L0X_ERROR_NONE) {
         printf("Range2 [mm]:            %6ld\r\n", dist2);
@@ -138,16 +142,23 @@
             if (!countdown1_triggered && !countdown2_triggered) {
                 countdown2_triggered = true;
                 countdown = cw;
-            } else if (countdown1_triggered) {
+            } else if (countdown1_triggered && !range2_just_triggered) {
                 printf("STEP OUT DETECTED\n");
                 hrmCounter = 16;
                 hrService->updateHeartRate(hrmCounter);
                 countdown1_triggered = false;
             }
+            
+            range2_just_triggered = true;
+        }
+        else {
+            led2 = 1;
+            range2_just_triggered = false;
         }
     } else {
-        printf("Range2 [mm]:                --\r\n");
+//        printf("Range2 [mm]:                --\r\n");
         led2 = 1;
+        range2_just_triggered = false;
     }
 }