aw shucks

meshtastic · Mar 24, 2024 · 099c922 · 099c922
1 parent c0db59d
commit 099c922
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/configuration.h b/src/configuration.h
@@ -161,6 +161,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    also enable HAS_ option not specifically disabled by variant.h */
 #include "architecture.h"
 
+#ifndef DEFAULT_REBOOT_SECONDS
+#define DEFAULT_REBOOT_SECONDS 7
+#endif
+
+#ifndef DEFAULT_SHUTDOWN_SECONDS
+#define DEFAULT_SHUTDOWN_SECONDS 2
+#endif
+
 /* Step #3: mop up with disabled values for HAS_ options not handled by the above two */
 
 // -----------------------------------------------------------------------------

diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
@@ -20,8 +20,6 @@
 
 #include "mqtt/MQTT.h"
 
-#define DEFAULT_REBOOT_SECONDS 7
-
 AdminModule *adminModule;
 bool hasOpenEditTransaction;
 

diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
@@ -412,16 +412,12 @@ int32_t CannedMessageModule::runOnce()
             // handle fn+s for shutdown
             case 0x9b:
                 screen->startShutdownScreen();
-                int s = 2;
-                LOG_INFO("Shutdown in %d seconds\n", s);
-                shutdownAtMsec = millis() + s * 1000;
+                shutdownAtMsec = millis() + DEFAULT_SHUTDOWN_SECONDS * 1000;
                 break;
             // and fn+r for reboot
             case 0x90:
                 screen->startRebootScreen();
-                int s = 2;
-                LOG_INFO("Reboot in %d seconds\n", s);
-                rebootAtMsec = millis() + s * 1000;
+                rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
                 break;
             default:
                 if (this->cursor == this->freetext.length()) {