Diff: main.cpp

Revision:

39:067ba1a475a5

Parent:

38:7035f67d8105

Child:

40:d332edae807d

diff -r 7035f67d8105 -r 067ba1a475a5 main.cpp
--- a/main.cpp	Sat Mar 16 16:09:17 2019 +0000
+++ b/main.cpp	Sun Mar 17 15:42:00 2019 +0000
@@ -198,7 +198,7 @@
 {
     printf("Bluetooth disconnected at %i\n", current_time);
     ::master_connected = false;
-    ::timestamp = 1;
+    ::timestamp = time_cycle;
     BLE::Instance(BLE::DEFAULT_INSTANCE).gap().startAdvertising();
 }
  
@@ -251,7 +251,6 @@
     dist2 = format_dist(distance2);
     
     if (status1 == VL53L0X_ERROR_NONE) {
-//        printf("Range1 [mm]:            %6ld\r\n", dist1);
         if (dist1 > DIST_MIN && dist1 < DIST_MAX) {
             led1 = 0;
             
@@ -265,11 +264,8 @@
                 } else {
                     enqueue_packet(1, current_time, packet_queue);
                 }
-//                hrmCounter = 1;
-//                hrService->updateHeartRate(hrmCounter);
                 countdown2_triggered = false;
             }
-            
             range1_just_triggered = true;
         }
         else {
@@ -277,12 +273,10 @@
             range1_just_triggered = false;
         }
     } else {
-//        printf("Range1 [mm]:                --\r\n");
         led1 = 1;
         range2_just_triggered = false;
     }
     if (status2 == VL53L0X_ERROR_NONE) {
-//        printf("Range2 [mm]:            %6ld\r\n", dist2);
         if (dist2 > DIST_MIN && dist2 < DIST_MAX) {
             led2 = 0;
             
@@ -292,12 +286,10 @@
             } else if (countdown1_triggered && !range2_just_triggered) {
                 printf("STEP OUT DETECTED\n");
                 if (master_connected) {
-                    send_packet(1, 0);
+                    send_packet(0, 0);
                 } else {
-                    enqueue_packet(1, current_time, packet_queue);
+                    enqueue_packet(0, current_time, packet_queue);
                 }
-//                hrmCounter = 16;
-//                hrService->updateHeartRate(hrmCounter);
                 countdown1_triggered = false;
             }
             
@@ -308,7 +300,6 @@
             range2_just_triggered = false;
         }
     } else {
-//        printf("Range2 [mm]:                --\r\n");
         led2 = 1;
         range2_just_triggered = false;
     }