Update to activity LED flashing to hopefully fix crach in esp_timer r…

…eported in issue ratgdo#30
dkerr64 · Jan 7, 2025 · e4f7d7a · e4f7d7a · mullender · Jan 8, 2025
1 parent 0b952d3
commit e4f7d7a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/led.cpp b/src/led.cpp
@@ -23,11 +23,6 @@
 LED led(LED_BUILTIN);
 LED laser(LASER_PIN);
 
-void LEDtimerCallback(LED *led)
-{
-    led->idle();
-}
-
 // Constructor for LED class
 LED::LED(uint8_t gpio_num, uint8_t state)
 {
@@ -74,8 +69,13 @@ void LED::setIdleState(uint8_t state)
     }
 }
 
-void LED::flash(unsigned long ms)
+void LED::flash(uint64_t ms)
 {
-    digitalWrite(pin, activeState);
-    LEDtimer.once_ms(ms, LEDtimerCallback, this);
+    if (!LEDtimer.active())
+    {
+        // Don't flash if we are already in a flash.
+        digitalWrite(pin, activeState);
+        LEDtimer.once_ms(ms, [this]()
+                         { this->idle(); });
+    }
 }
diff --git a/src/led.h b/src/led.h
@@ -38,7 +38,7 @@ class LED
     void off();
     void idle();
     bool state() { return (currentState == onState); };
-    void flash(unsigned long ms = FLASH_MS);
+    void flash(uint64_t ms = FLASH_MS);
     void setIdleState(uint8_t state);
     uint8_t getIdleState() { return idleState; };
 };

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
@@ -216,7 +216,6 @@ void calculatePresence(int16_t distance)
         vehicleDetected = false;
     if (vehicleDetected != priorVehicleDetected)
     {
-        led.flash();
         // if change occurs with arrival/departure window then record motion,
         // presence timer is set when door opens.
         lastChangeAt = millis64();