♻️ Power-off Timer

Author: thinkyhead

Marlin/src/feature/power.cpp

@@ -61,7 +61,7 @@ bool Power::psu_on;
     #include "spindle_laser.h"
   #endif
 
-  millis_t Power::lastPowerOn;
+  millis_t Power::lastPowerOn; // = 0
 #endif
 
 #if PSU_TRACK_STATE_MS
@@ -169,8 +169,9 @@ void Power::power_off() {
 #if ANY(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
 
   #if ENABLED(POWER_OFF_TIMER)
-    millis_t Power::power_off_time = 0;
-    void Power::setPowerOffTimer(const millis_t delay_ms) { power_off_time = millis() + delay_ms; }
+    millis_t Power::power_off_start_ms = 0;
+    uint16_t power_off_secs = 0;
+    void Power::setPowerOffTimer(const uint16_t delay_sec) { power_off_start_ms = millis(); power_off_secs = delay_sec; }
   #endif
 
   #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
@@ -179,14 +180,14 @@ void Power::power_off() {
   #endif
 
   void Power::cancelAutoPowerOff() {
-    TERN_(POWER_OFF_TIMER, power_off_time = 0);
+    TERN_(POWER_OFF_TIMER, power_off_secs = 0);
     TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, power_off_on_cooldown = false);
   }
 
   void Power::checkAutoPowerOff() {
-    if (TERN1(POWER_OFF_TIMER, !power_off_time) && TERN1(POWER_OFF_WAIT_FOR_COOLDOWN, !power_off_on_cooldown)) return;
+    if (TERN1(POWER_OFF_TIMER, !power_off_secs) && TERN1(POWER_OFF_WAIT_FOR_COOLDOWN, !power_off_on_cooldown)) return;
     if (TERN0(POWER_OFF_WAIT_FOR_COOLDOWN, power_off_on_cooldown && is_cooling_needed())) return;
-    if (TERN0(POWER_OFF_TIMER, power_off_time && PENDING(millis(), power_off_time))) return;
+    if (TERN0(POWER_OFF_TIMER, power_off_secs && PENDING(millis(), power_off_start_ms, SEC_TO_MS(power_off_secs)))) return;
     power_off();
   }
 
@@ -247,8 +248,9 @@ void Power::power_off() {
    * @param pause  pause the 'timer'
    */
   void Power::check(const bool pause) {
-    static millis_t nextPowerCheck = 0;
+    static MTimeout24 lastPowerCheck;
     const millis_t now = millis();
+
     #if POWER_TIMEOUT > 0
       static bool _pause = false;
       if (pause != _pause) {
@@ -257,8 +259,9 @@ void Power::power_off() {
       }
       if (pause) return;
     #endif
-    if (ELAPSED(now, nextPowerCheck)) {
-      nextPowerCheck = now + 2500UL;
+
+    if (lastPowerCheck.elapsed(now)) {
+      lastPowerCheck.start(2500);
       if (is_power_needed())
         power_on();
       else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn, SEC_TO_MS(POWER_TIMEOUT))))

Marlin/src/feature/power.h

@@ -47,7 +47,7 @@ class Power {
     #if ANY(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
       #if ENABLED(POWER_OFF_TIMER)
         static millis_t power_off_time;
-        static void setPowerOffTimer(const millis_t delay_ms);
+        static void setPowerOffTimer(const uint16_t delay_sec);
       #endif
       #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
         static bool power_off_on_cooldown;

Marlin/src/gcode/control/M80_M81.cpp

@@ -76,6 +76,12 @@
  * M81: Turn off Power, including Power Supply, if there is one.
  *
  *      This code should ALWAYS be available for FULL SHUTDOWN!
+ *
+ * With POWER_OFF_TIMER:
+ *  D<seconds> - Set timer for power-off to occur in some number of seconds
+ *
+ * With POWER_OFF_WAIT_FOR_COOLDOWN:
+ *  S<bool>    - Enable / disable Power-Off when the machine has cooled down
  */
 void GcodeSuite::M81() {
   planner.finish_and_disable();
@@ -102,10 +108,10 @@ void GcodeSuite::M81() {
 
   #if ENABLED(POWER_OFF_TIMER)
     if (parser.seenval('D')) {
-      uint16_t delay = parser.value_ushort();
-      if (delay > 1) { // skip already observed 1s delay
+      const uint16_t seconds = parser.value_ushort();
+      if (seconds > 1) { // skip already observed 1s delay
         delayed_power_off = true;
-        powerManager.setPowerOffTimer(SEC_TO_MS(delay - 1));
+        powerManager.setPowerOffTimer(seconds - 1);
       }
     }
   #endif