New training button behavior

Firmware/LoRaSerial/Commands.ino

@@ -145,7 +145,7 @@ bool commandAT(const char * commandString)
         return true;
 
       case ('G'): //ATG - Generate a new netID and encryption key
-        generateRandomKeysID();
+        generateRandomKeysID(&tempSettings);
         return true;
 
       case ('I'): //ATI
@@ -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;
 
@@ -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/LoRaSerial.ino

@@ -166,8 +166,11 @@ uint8_t AESiv[AES_IV_BYTES] = {0}; //Set during hop table generation
 #include <JC_Button.h> // http://librarymanager/All#JC_Button //v2.1.2
 Button *trainBtn = NULL; //We can't instantiate the button here because we don't yet know what pin number to use
 
-const int trainButtonTime = 2000; //ms press and hold before entering training
-bool trainViaButton = false; //Allows auto-creation of server if client times out
+const int trainButtonClientTime = 4 * 1000; //ms press and hold before entering client training
+const int trainButtonServerTime = 8 * 1000; //ms press and hold before entering server training
+const int trainButtonFactoryResetTime = 16 * 1000; //ms press and hold before reset
+
+bool inTraining; //True if training is in process
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Hardware Timers
@@ -487,7 +490,6 @@ bool trainingPreviousRxInProgress = false; //Previous RX status
 float originalChannel; //Original channel from HOP table while training is in progress
 uint8_t trainingPartnerID[UNIQUE_ID_BYTES]; //Unique ID of the training partner
 uint8_t myUniqueId[UNIQUE_ID_BYTES]; // Unique ID of this system
-unsigned long trainingTimer;
 
 //Virtual-Circuit
 int8_t cmdVc;   //VC index for ATI commands only
@@ -509,7 +511,9 @@ unsigned long retransmitTimeout = 0; //Throttle back re-transmits
 //Global variables
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 const Settings defaultSettings;
-Settings tempSettings; //Create a duplicate of settings during training so that we can resort as needed
+Settings settings; //Active settings used by the radio
+Settings tempSettings; //Temporary settings used for command processing
+Settings trainingSettings; //Settings used for training other radios
 
 char platformPrefix[25]; //Used for printing platform specific device name, ie "SAMD21 1W 915MHz"
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

Firmware/LoRaSerial/Radio.ino

@@ -1237,88 +1237,88 @@ void updateRadioParameters(uint8_t * rxData)
   memcpy(&params, rxData, sizeof(params));
 
   //Update the radio parameters
-  tempSettings.autoTuneFrequency = params.autoTuneFrequency;
-  tempSettings.frequencyHop = params.frequencyHop;
-  tempSettings.frequencyMax = params.frequencyMax;
-  tempSettings.frequencyMin = params.frequencyMin;
-  tempSettings.maxDwellTime = params.maxDwellTime;
-  tempSettings.numberOfChannels = params.numberOfChannels;
-  tempSettings.radioBandwidth = params.radioBandwidth;
-  tempSettings.radioBroadcastPower_dbm = params.radioBroadcastPower_dbm;
-  tempSettings.radioCodingRate = params.radioCodingRate;
-  tempSettings.radioPreambleLength = params.radioPreambleLength;
-  tempSettings.radioSpreadFactor = params.radioSpreadFactor;
-  tempSettings.radioSyncWord = params.radioSyncWord;
-  tempSettings.txToRxUsec = params.txToRxUsec;
+  trainingSettings.autoTuneFrequency = params.autoTuneFrequency;
+  trainingSettings.frequencyHop = params.frequencyHop;
+  trainingSettings.frequencyMax = params.frequencyMax;
+  trainingSettings.frequencyMin = params.frequencyMin;
+  trainingSettings.maxDwellTime = params.maxDwellTime;
+  trainingSettings.numberOfChannels = params.numberOfChannels;
+  trainingSettings.radioBandwidth = params.radioBandwidth;
+  trainingSettings.radioBroadcastPower_dbm = params.radioBroadcastPower_dbm;
+  trainingSettings.radioCodingRate = params.radioCodingRate;
+  trainingSettings.radioPreambleLength = params.radioPreambleLength;
+  trainingSettings.radioSpreadFactor = params.radioSpreadFactor;
+  trainingSettings.radioSyncWord = params.radioSyncWord;
+  trainingSettings.txToRxUsec = params.txToRxUsec;
 
   //Update the radio protocol parameters
-  tempSettings.dataScrambling = params.dataScrambling;
-  tempSettings.enableCRC16 = params.enableCRC16;
-  tempSettings.encryptData = params.encryptData;
-  memcpy(tempSettings.encryptionKey, params.encryptionKey, sizeof(tempSettings.encryptionKey));
-  tempSettings.framesToYield = params.framesToYield;
-  tempSettings.heartbeatTimeout = params.heartbeatTimeout;
-  tempSettings.maxResends = params.maxResends;
-  tempSettings.netID = params.netID;
-  tempSettings.operatingMode = params.operatingMode;
-  tempSettings.overheadTime = params.overheadTime;
-  tempSettings.selectLedUse = params.selectLedUse;
-  tempSettings.server = params.server;
-  tempSettings.verifyRxNetID = params.verifyRxNetID;
+  trainingSettings.dataScrambling = params.dataScrambling;
+  trainingSettings.enableCRC16 = params.enableCRC16;
+  trainingSettings.encryptData = params.encryptData;
+  memcpy(trainingSettings.encryptionKey, params.encryptionKey, sizeof(trainingSettings.encryptionKey));
+  trainingSettings.framesToYield = params.framesToYield;
+  trainingSettings.heartbeatTimeout = params.heartbeatTimeout;
+  trainingSettings.maxResends = params.maxResends;
+  trainingSettings.netID = params.netID;
+  trainingSettings.operatingMode = params.operatingMode;
+  trainingSettings.overheadTime = params.overheadTime;
+  trainingSettings.selectLedUse = params.selectLedUse;
+  trainingSettings.server = params.server;
+  trainingSettings.verifyRxNetID = params.verifyRxNetID;
 
   //Update the debug parameters
   if (params.copyDebug)
   {
-    tempSettings.copyDebug = params.copyDebug;
-    tempSettings.debug = params.debug;
-    tempSettings.debugDatagrams = params.debugDatagrams;
-    tempSettings.debugHeartbeat = params.debugHeartbeat;
-    tempSettings.debugNvm = params.debugNvm;
-    tempSettings.debugRadio = params.debugRadio;
-    tempSettings.debugReceive = params.debugReceive;
-    tempSettings.debugSerial = params.debugSerial;
-    tempSettings.debugStates = params.debugStates;
-    tempSettings.debugSync = params.debugSync;
-    tempSettings.debugTraining = params.debugTraining;
-    tempSettings.debugTransmit = params.debugTransmit;
-    tempSettings.displayRealMillis = params.displayRealMillis;
-    tempSettings.printAckNumbers = params.printAckNumbers;
-    tempSettings.printChannel = params.printChannel;
-    tempSettings.printFrequency = params.printFrequency;
-    tempSettings.printLinkUpDown = params.printLinkUpDown;
-    tempSettings.printPacketQuality = params.printPacketQuality;
-    tempSettings.printPktData = params.printPktData;
-    tempSettings.printRfData = params.printRfData;
-    tempSettings.printTimestamp = params.printTimestamp;
-    tempSettings.printTxErrors = params.printTxErrors;
+    trainingSettings.copyDebug = params.copyDebug;
+    trainingSettings.debug = params.debug;
+    trainingSettings.debugDatagrams = params.debugDatagrams;
+    trainingSettings.debugHeartbeat = params.debugHeartbeat;
+    trainingSettings.debugNvm = params.debugNvm;
+    trainingSettings.debugRadio = params.debugRadio;
+    trainingSettings.debugReceive = params.debugReceive;
+    trainingSettings.debugSerial = params.debugSerial;
+    trainingSettings.debugStates = params.debugStates;
+    trainingSettings.debugSync = params.debugSync;
+    trainingSettings.debugTraining = params.debugTraining;
+    trainingSettings.debugTransmit = params.debugTransmit;
+    trainingSettings.displayRealMillis = params.displayRealMillis;
+    trainingSettings.printAckNumbers = params.printAckNumbers;
+    trainingSettings.printChannel = params.printChannel;
+    trainingSettings.printFrequency = params.printFrequency;
+    trainingSettings.printLinkUpDown = params.printLinkUpDown;
+    trainingSettings.printPacketQuality = params.printPacketQuality;
+    trainingSettings.printPktData = params.printPktData;
+    trainingSettings.printRfData = params.printRfData;
+    trainingSettings.printTimestamp = params.printTimestamp;
+    trainingSettings.printTxErrors = params.printTxErrors;
   }
 
   //Update the serial parameters
   if (params.copySerial)
   {
-    tempSettings.copySerial = params.copySerial;
-    tempSettings.echo = params.echo;
-    tempSettings.flowControl = params.flowControl;
-    tempSettings.invertCts = params.invertCts;
-    tempSettings.invertRts = params.invertRts;
-    tempSettings.serialSpeed = params.serialSpeed;
-    tempSettings.serialTimeoutBeforeSendingFrame_ms = params.serialTimeoutBeforeSendingFrame_ms;
-    tempSettings.usbSerialWait = params.usbSerialWait;
+    trainingSettings.copySerial = params.copySerial;
+    trainingSettings.echo = params.echo;
+    trainingSettings.flowControl = params.flowControl;
+    trainingSettings.invertCts = params.invertCts;
+    trainingSettings.invertRts = params.invertRts;
+    trainingSettings.serialSpeed = params.serialSpeed;
+    trainingSettings.serialTimeoutBeforeSendingFrame_ms = params.serialTimeoutBeforeSendingFrame_ms;
+    trainingSettings.usbSerialWait = params.usbSerialWait;
   }
 
   //Update the training values
-  tempSettings.clientFindPartnerRetryInterval = params.clientFindPartnerRetryInterval;
+  trainingSettings.clientFindPartnerRetryInterval = params.clientFindPartnerRetryInterval;
   //The trainingKey is already the same
-  tempSettings.trainingTimeout = params.trainingTimeout;
+  trainingSettings.trainingTimeout = params.trainingTimeout;
 
   //Update the trigger parameters
   if (params.copyTriggers)
   {
-    tempSettings.copyTriggers = params.copyTriggers;
-    tempSettings.triggerEnable = params.triggerEnable;
-    tempSettings.triggerEnable2 = params.triggerEnable2;
-    tempSettings.triggerWidth = params.triggerWidth;
-    tempSettings.triggerWidthIsMultiplier = params.triggerWidthIsMultiplier;
+    trainingSettings.copyTriggers = params.copyTriggers;
+    trainingSettings.triggerEnable = params.triggerEnable;
+    trainingSettings.triggerEnable2 = params.triggerEnable2;
+    trainingSettings.triggerWidth = params.triggerWidth;
+    trainingSettings.triggerWidthIsMultiplier = params.triggerWidthIsMultiplier;
   }
 }
 
@@ -1334,7 +1334,7 @@ bool xmitDatagramTrainRadioParameters(const uint8_t * clientID)
   radioCallHistory[RADIO_CALL_xmitDatagramTrainRadioParameters] = millis();
 
   //Initialize the radio parameters
-  memcpy(&params, &tempSettings, sizeof(settings));
+  memcpy(&params, &trainingSettings, sizeof(settings));
   params.server = false;
 
   //Add the destination (client) ID

Firmware/LoRaSerial/States.ino

@@ -1717,14 +1717,16 @@ void updateRadioState()
 
               //If we are training via button, and in point to point mode, and the user has not manually set the server
               //then reboot with current settings after a single client acks
-              if (trainViaButton
-                  && tempSettings.operatingMode == MODE_POINT_TO_POINT
-                  && tempSettings.server == false)
+              if (inTraining
+                  && (trainingSettings.operatingMode == MODE_POINT_TO_POINT)
+                  && (!trainingSettings.server))
               {
+                //Save the training parameters
+                settings = trainingSettings;
+                recordSystemSettings();
+
                 //Reboot the radio with the newly generated random netID/Key parameters
-                petWDT();
-                systemFlush();
-                systemReset();
+                commandReset();
               }
             }
             break;