Merge pull request #499 from LeeLeahy2/command-reset

Use a common reset function

Author: nseidle

Firmware/LoRaSerial/Commands.ino

@@ -199,17 +199,7 @@ bool commandAT(const char * commandString)
         }
 
         reportOK();
-        if (serialOperatingMode == MODE_VIRTUAL_CIRCUIT)
-        {
-          //Notify the PC of the serial port failure
-          serialOutputByte(START_OF_VC_SERIAL);
-          serialOutputByte(3);
-          serialOutputByte(PC_SERIAL_RECONNECT);
-          serialOutputByte(myVc);
-        }
-        outputSerialData(true);
-        systemFlush();
-        systemReset();
+        commandReset();
         return true;
     }
   }
@@ -852,6 +842,7 @@ void reportOK()
   commandComplete(true);
 }
 
+//Notify the host that the command is complete
 void commandComplete(bool success)
 {
   if (settings.operatingMode == MODE_VIRTUAL_CIRCUIT)
@@ -867,6 +858,22 @@ void commandComplete(bool success)
   }
 }
 
+//Notify the host of the reset then reboot the system
+void commandReset()
+{
+  if (serialOperatingMode == MODE_VIRTUAL_CIRCUIT)
+  {
+    //Notify the PC of the serial port failure
+    serialOutputByte(START_OF_VC_SERIAL);
+    serialOutputByte(3);
+    serialOutputByte(PC_SERIAL_RECONNECT);
+    serialOutputByte(myVc);
+  }
+  outputSerialData(true);
+  systemFlush();
+  systemReset();
+}
+
 //Remove any preceeding or following whitespace chars
 char * trimCommand()
 {

Firmware/LoRaSerial/States.ino

@@ -1722,9 +1722,7 @@ void updateRadioState()
                   && tempSettings.server == false)
               {
                 //Reboot the radio with the newly generated random netID/Key parameters
-                petWDT();
-                systemFlush();
-                systemReset();
+                commandReset;
               }
             }
             break;

Firmware/LoRaSerial/Train.ino

@@ -205,7 +205,5 @@ void endClientServerTraining(uint8_t event)
   trainingServerRunning = false;
 
   //Reboot the radio with the new parameters
-  petWDT();
-  systemFlush();
-  systemReset();
+  commandReset();
 }