From 86960cdb1da072b7ac8bd4561296b3baaf78d414 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 22 Jul 2025 06:21:51 -0500
Subject: [PATCH] Moves the shutdown thread into the Power class, make shutdown
 and reboot private (#7415)

---
 src/Power.cpp    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/PowerFSM.cpp |  2 +-
 src/main.cpp     |  3 +--
 src/power.h      |  4 +++-
 src/shutdown.h   | 47 -----------------------------------------------
 5 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 src/shutdown.h

diff --git a/src/Power.cpp b/src/Power.cpp
index 298f08e0d..b489bc33c 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -20,6 +20,11 @@
 #include "meshUtils.h"
 #include "sleep.h"
 
+#if defined(ARCH_PORTDUINO)
+#include "api/WiFiServerAPI.h"
+#include "input/LinuxInputImpl.h"
+#endif
+
 // Working USB detection for powered/charging states on the RAK platform
 #ifdef NRF_APM
 #include "nrfx_power.h"
@@ -690,6 +695,47 @@ bool Power::setup()
     return found;
 }
 
+void Power::powerCommandsCheck()
+{
+    if (rebootAtMsec && millis() > rebootAtMsec) {
+        LOG_INFO("Rebooting");
+        reboot();
+    }
+
+    if (shutdownAtMsec && millis() > shutdownAtMsec) {
+        shutdownAtMsec = 0;
+        shutdown();
+    }
+}
+
+void Power::reboot()
+{
+    notifyReboot.notifyObservers(NULL);
+#if defined(ARCH_ESP32)
+    ESP.restart();
+#elif defined(ARCH_NRF52)
+    NVIC_SystemReset();
+#elif defined(ARCH_RP2040)
+    rp2040.reboot();
+#elif defined(ARCH_PORTDUINO)
+    deInitApiServer();
+    if (aLinuxInputImpl)
+        aLinuxInputImpl->deInit();
+    SPI.end();
+    Wire.end();
+    Serial1.end();
+    if (screen)
+        delete screen;
+    LOG_DEBUG("final reboot!");
+    reboot();
+#elif defined(ARCH_STM32WL)
+    HAL_NVIC_SystemReset();
+#else
+    rebootAtMsec = -1;
+    LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
+#endif
+}
+
 void Power::shutdown()
 {
 
diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 3b3f8080d..322b877ff 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -72,7 +72,7 @@ extern Power *power;
 static void shutdownEnter()
 {
     LOG_DEBUG("State: SHUTDOWN");
-    power->shutdown();
+    shutdownAtMsec = millis();
 }
 
 #include "error.h"
diff --git a/src/main.cpp b/src/main.cpp
index c3e7c2a33..1868d98c7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,6 @@
 #include "mesh/generated/meshtastic/config.pb.h"
 #include "meshUtils.h"
 #include "modules/Modules.h"
-#include "shutdown.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <memory>
@@ -1530,7 +1529,7 @@ void loop()
 #ifdef ARCH_NRF52
     nrf52Loop();
 #endif
-    powerCommandsCheck();
+    power->powerCommandsCheck();
 
 #ifdef DEBUG_STACK
     static uint32_t lastPrint = 0;
diff --git a/src/power.h b/src/power.h
index 046980bd6..1c078c06d 100644
--- a/src/power.h
+++ b/src/power.h
@@ -110,7 +110,7 @@ class Power : private concurrency::OSThread
 
     Power();
 
-    void shutdown();
+    void powerCommandsCheck();
     void readPowerStatus();
     virtual bool setup();
     virtual int32_t runOnce() override;
@@ -130,6 +130,8 @@ class Power : private concurrency::OSThread
     bool lipoChargerInit();
 
   private:
+    void shutdown();
+    void reboot();
     // open circuit voltage lookup table
     uint8_t low_voltage_counter;
 #ifdef DEBUG_HEAP
diff --git a/src/shutdown.h b/src/shutdown.h
deleted file mode 100644
index 973e388b1..000000000
--- a/src/shutdown.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "buzz.h"
-#include "configuration.h"
-#include "graphics/Screen.h"
-#include "main.h"
-#include "power.h"
-#include "sleep.h"
-#if defined(ARCH_PORTDUINO)
-#include "api/WiFiServerAPI.h"
-#include "input/LinuxInputImpl.h"
-
-#endif
-
-void powerCommandsCheck()
-{
-    if (rebootAtMsec && millis() > rebootAtMsec) {
-        LOG_INFO("Rebooting");
-        notifyReboot.notifyObservers(NULL);
-#if defined(ARCH_ESP32)
-        ESP.restart();
-#elif defined(ARCH_NRF52)
-        NVIC_SystemReset();
-#elif defined(ARCH_RP2040)
-        rp2040.reboot();
-#elif defined(ARCH_PORTDUINO)
-        deInitApiServer();
-        if (aLinuxInputImpl)
-            aLinuxInputImpl->deInit();
-        SPI.end();
-        Wire.end();
-        Serial1.end();
-        if (screen)
-            delete screen;
-        LOG_DEBUG("final reboot!");
-        reboot();
-#elif defined(ARCH_STM32WL)
-        HAL_NVIC_SystemReset();
-#else
-        rebootAtMsec = -1;
-        LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
-#endif
-    }
-
-    if (shutdownAtMsec && millis() > shutdownAtMsec) {
-        shutdownAtMsec = 0;
-        power->shutdown();
-    }
-}
\ No newline at end of file