clean-up songs

FW/leo_muziekdoos_esp32/src/power.cpp

@@ -4,7 +4,7 @@ bool powerbutton_released = true;
 
 uint32_t PowerLastKeepAlive = 0;
 uint32_t PowerOtaLongPressTime = 0;
-uint64_t measure_timer = 0;
+uint32_t powerstate_timer = 0;
 
 POWERSTATES powerstate = off;
 POWERSTATES lastState = off;
@@ -124,16 +124,22 @@ void handlePowerState(void)
     if (buttonPower.pressedFor(100))
     {
       lastState = on;
-      powerstate = poweringOff;
+      powerstate = POWERSTATES::poweringOff;
       break;
     }
     if (getLowBatt())
     {
       log_w("on: Lowbat");
-      powerstate = lowBatt;
+      powerstate_timer = millis();
+      powerstate = POWERSTATES::lowBatt;
       SetLedColor(CRGB::Red, true);
       break;
     }
+    if(millis() - PowerLastKeepAlive > TIMEOUT_POWER)
+    {
+      powerstate_timer = millis();
+      powerstate = POWERSTATES::timeOut;
+    }
   }
   break;
   case poweringOff:
@@ -146,16 +152,6 @@ void handlePowerState(void)
 
       log_w("poweringoff: 3/3 ==> powerOff");
     }
-    else if (buttonPower.pressedFor(500))
-    {
-      log_w("poweringoff: 2/3");
-      SetLedColor(CRGB::Orange, true);
-    }
-    else if (buttonPower.pressedFor(200))
-    {
-      log_w("poweringoff: 1/3");
-      SetLedColor(CRGB::Brown, true);
-    }
     else
     {
       powerstate = lastState;
@@ -174,17 +170,16 @@ void handlePowerState(void)
   break;
   case timeOut:
   {
-    log_w("timeout ==> off");
-    powerstate = off;
-    SetLedColor(CRGB::Red, true);
-    powerOff();
-    delay(5000);
+    log_w("timeout");
+    SetLedColor(CRGB::Yellow, true);
+    if(millis() - powerstate_timer > POWEROFFOFFDELAY)
+    {
+      powerstate = off;
+    }
   }
   break;
   case lowBatt:
   {
-    // add delay
-    //powerstate = off;
     if(!getLowBatt())
     {
       powerstate = on;
@@ -194,6 +189,12 @@ void handlePowerState(void)
     {
       SetLedColor(CRGB::Red, true);
     }
+
+    // add delay
+    if(millis() - powerstate_timer > POWEROFFOFFDELAY)
+    {
+      powerstate = off;
+    }
   }
   break;
   case overTheAir: