Merge pull request #501 from LeeLeahy2/move-set-of-training-settings

Make the callers set trainingSettings

Author: nseidle

Firmware/LoRaSerial/Commands.ino

@@ -183,7 +183,7 @@ bool commandAT(const char * commandString)
         return true;
 
       case ('T'): //ATT - Enter training mode
-        settings = tempSettings; //Apply user's modifications
+        trainingSettings = tempSettings; //Apply user's modifications
         selectTraining();
         return true;
 

Firmware/LoRaSerial/System.ino

@@ -268,6 +268,7 @@ void updateButton()
       trainState = TRAIN_PRESSED;
 
       trainViaButton = true;
+      trainingSettings = settings;
       selectTraining();
     }
     else if (trainState == TRAIN_PRESSED && trainBtn->wasReleased())
@@ -276,7 +277,7 @@ void updateButton()
     }
     else if (trainState == TRAIN_IN_PROCESS && trainBtn->wasReleased())
     {
-      settings = tempSettings; //Return to original radio settings
+      settings = trainingSettings; //Return to original radio settings
 
       recordSystemSettings(); //Record original settings
 

Firmware/LoRaSerial/Train.ino

@@ -103,9 +103,6 @@ void beginTrainingServer()
 //Perform the common training initialization
 void commonTrainingInitialization()
 {
-  //Save the current settings
-  trainingSettings = settings;
-
   //Use common radio settings between the client and server for training
   settings = defaultSettings;
   settings.dataScrambling = true;           //Scramble the data