Merge pull request #99 from fape/fix_compile_now

fix compile error
voroshkov · Dec 31, 2018 · 21f14f4 · 21f14f4
2 parents e4d410b + 7503bf2
commit 21f14f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Arduino/chorus_rf_laptimer/chorus_rf_laptimer.ino b/Arduino/chorus_rf_laptimer/chorus_rf_laptimer.ino
@@ -236,6 +236,7 @@ uint8_t isSendQueueFull = 0;
 
 //----- Lap timings--------------------------------
 uint32_t lastMilliseconds = 0;
+uint32_t now = 0;
 uint32_t raceStartTime = 0;
 #define MIN_MIN_LAP_TIME 1 //seconds
 #define MAX_MIN_LAP_TIME 120 //seconds

diff --git a/Arduino/chorus_rf_laptimer/mainDetectionAlgorithm.h b/Arduino/chorus_rf_laptimer/mainDetectionAlgorithm.h
@@ -5,7 +5,7 @@ void runLapDetectionAlgorithm() {
             if (allowLapGeneration) {  // we haven't fired event for this drone proximity case yet
                 allowLapGeneration = 0;
 
-                uint32_t now = millis();
+                now = millis();
                 uint32_t diff = now - lastMilliseconds; //time diff with the last lap (or with the race start)
                 if (timeAdjustment != 0 && timeAdjustment != INFINITE_TIME_ADJUSTMENT) {
                     diff = diff + (int32_t)diff/timeAdjustment;