Merge pull request #486 from LeeLeahy2/remove-switch-to-server

Training: Remove switch to server from client

Author: nseidle

Firmware/LoRaSerial/LoRaSerial.ino

@@ -510,9 +510,6 @@ unsigned long retransmitTimeout = 0; //Throttle back re-transmits
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 const Settings defaultSettings;
 Settings tempSettings; //Create a duplicate of settings during training so that we can resort as needed
-uint8_t originalEncryptionKey[AES_KEY_BYTES] = {0}; //Temp store key if we need to exit button training
-uint8_t originalNetID = 0; //Temp store ID if we need to exit button training
-bool originalServer = false; //Temp store server setting if we need to exit button training
 
 char platformPrefix[25]; //Used for printing platform specific device name, ie "SAMD21 1W 915MHz"
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

Firmware/LoRaSerial/States.ino

@@ -1599,24 +1599,7 @@ void updateRadioState()
       //Check for a receive timeout
       else if ((millis() - datagramTimer) > (settings.clientFindPartnerRetryInterval * 1000))
       {
-        //If we are training with button, in P2P mode, and user has not set server mode
-        //Automatically switch to server
-        if (trainViaButton
-            && tempSettings.operatingMode == MODE_POINT_TO_POINT
-            && originalServer == false)
-        {
-          //Give up and change to Server automatically
-
-          settings = tempSettings; //Return to original radio settings
-
-          generateRandomKeysID(); //Generate random netID and AES key
-
-          beginTrainingServer(); //Change to server
-        }
-        else
-        {
-          xmitDatagramTrainingFindPartner(); //Continue retrying as client
-        }
+        xmitDatagramTrainingFindPartner();
       }
       break;
 
@@ -1736,7 +1719,7 @@ void updateRadioState()
               //then reboot with current settings after a single client acks
               if (trainViaButton
                   && tempSettings.operatingMode == MODE_POINT_TO_POINT
-                  && originalServer == false)
+                  && tempSettings.server == false)
               {
                 //Reboot the radio with the newly generated random netID/Key parameters
                 petWDT();

Firmware/LoRaSerial/System.ino

@@ -278,11 +278,6 @@ void updateButton()
     {
       settings = tempSettings; //Return to original radio settings
 
-      //Return to original keys, ID, and server state
-      memcpy(&settings.encryptionKey, &originalEncryptionKey, AES_KEY_BYTES);
-      settings.netID = originalNetID;
-      settings.server = originalServer;
-
       recordSystemSettings(); //Record original settings
 
       //Reboot the radio

Firmware/LoRaSerial/Train.ino

@@ -1,12 +1,6 @@
 //Select the training protocol
 void selectTraining()
 {
-  //If we are training via button, and in P2P mode, and Server is not set
-  //we will need these settings if we exit training
-  memcpy(&originalEncryptionKey, &settings.encryptionKey, AES_KEY_BYTES);
-  originalNetID = settings.netID;
-  originalServer = settings.server;
-
   if (settings.server)
     beginTrainingServer();
   else