wired up the reset / reboot ! commands

Author: gigapod

sfeIoTNodeLoRaWAN/sfeIoTNodeLoRaWAN.cpp

@@ -517,7 +517,7 @@ void sfeIoTNodeLoRaWAN::onSettingsEdit(bool bLoading)
         if (inOpMode(kAppOpPendingRestart))
         {
             flxLog_N("\n\rSome changes required a device restart to take effect...");
-            // _sysUpdate.restartDevice();
+            _sysSystem.restartDevice();
 
             // this shouldn't return unless user aborted
             clearOpMode(kAppOpPendingRestart);

sfeIoTNodeLoRaWAN/sfeNLCommands.h

@@ -25,46 +25,28 @@ class sfeNLCommands
     //---------------------------------------------------------------------
     // Command Callbacks
     //---------------------------------------------------------------------
-    // bool factoryResetDevice(sfeIoTNodeLoRaWAN *theApp)
-    // {
-    //     if (!theApp)
-    //         return false;
 
-    //     return theApp->_sysUpdate.factoryResetDevice();
-    // }
+    //---------------------------------------------------------------------
+    bool resetDevice(sfeIoTNodeLoRaWAN *theApp)
+    {
+        if (!theApp)
+            return false;
 
-    // //---------------------------------------------------------------------
-    // bool resetDevice(sfeIoTNodeLoRaWAN *theApp)
-    // {
-    //     if (!theApp)
-    //         return false;
-
-    //     // Need to prompt for an a-okay ...
-    //     Serial.printf("\n\rClear and Restart Device? [Y/n]? ");
-    //     uint8_t selected = theApp->_serialSettings.getMenuSelectionYN();
-    //     flxLog_N("");
-
-    //     if (selected != 'y' || selected == kReadBufferTimeoutExpired || selected == kReadBufferExit)
-    //     {
-    //         flxLog_I(F("Aborting..."));
-    //         return false;
-    //     }
-
-    //     return resetDeviceForced(theApp);
-    // }
-    // //---------------------------------------------------------------------
-    // bool resetDeviceForced(sfeIoTNodeLoRaWAN *theApp)
-    // {
-    //     if (!theApp)
-    //         return false;
+        theApp->_sysSystem.resetDevicePrompt();
 
-    //     theApp->_sysStorage.resetStorage();
-    //     flxLog_I(F("Settings Cleared"));
+        // should never get here
+        return true;
+    }
+    //---------------------------------------------------------------------
+    bool resetDeviceForced(sfeIoTNodeLoRaWAN *theApp)
+    {
+        if (!theApp)
+            return false;
 
-    //     theApp->_sysUpdate.restartDevice();
+        theApp->_sysSystem.resetDevice();
 
-    //     return true;
-    // }
+        return true;
+    }
     //---------------------------------------------------------------------
     bool clearDeviceSettings(sfeIoTNodeLoRaWAN *theApp)
     {
@@ -100,17 +82,17 @@ class sfeNLCommands
     // //---------------------------------------------------------------------
     bool restartDevice(sfeIoTNodeLoRaWAN *theApp)
     {
-        // if (theApp)
-        //     theApp->_sysUpdate.restartDevicePrompt();
+        if (theApp)
+            theApp->_sysSystem.restartDevicePrompt();
 
         return true;
     }
     //---------------------------------------------------------------------
     bool restartDeviceForced(sfeIoTNodeLoRaWAN *theApp)
     {
 
-        // if (theApp)
-        //     theApp->_sysUpdate.restartDevice();
+        if (theApp)
+            theApp->_sysSystem.restartDevice();
 
         return true;
     }
@@ -406,9 +388,8 @@ class sfeNLCommands
     //---------------------------------------------------------------------
     // our command map - command name to callback method
     commandMap_t _commandMap = {
-        // {"factory-reset", &sfeNLCommands::factoryResetDevice},
-        // {"reset-device", &sfeNLCommands::resetDevice},
-        // {"reset-device-forced", &sfeNLCommands::resetDeviceForced},
+        {"reset-device", &sfeNLCommands::resetDevice},
+        {"reset-device-forced", &sfeNLCommands::resetDeviceForced},
         {"clear-settings", &sfeNLCommands::clearDeviceSettings},
         {"clear-settings-forced", &sfeNLCommands::clearDeviceSettingsForced},
         {"restart", &sfeNLCommands::restartDevice},