Separate the default settings from the values in settings.h

Author: LeeLeahy2

Firmware/LoRaSerial/Commands.ino

@@ -130,7 +130,7 @@ bool commandAT(const char * commandString)
         return true;
 
       case ('F'): //ATF - Restore default parameters
-        settings = defaultSettings; //Overwrite all system settings with defaults
+        getDefaultSettings(&settings); //Overwrite all system settings with defaults
 
         validateSettings(); //Modify defaults for each radio type (915, 868, 433, etc)
 

Firmware/LoRaSerial/LoRaSerial.ino

@@ -518,7 +518,6 @@ unsigned long retransmitTimeout = 0; //Throttle back re-transmits
 
 //Global variables
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-const Settings defaultSettings;
 Settings settings; //Active settings used by the radio
 Settings tempSettings; //Temporary settings used for command processing
 Settings trainingSettings; //Settings used for training other radios
@@ -629,6 +628,15 @@ void setup()
   arch.beginBoard(); //Initialize the board specific hardware, and ID platform type
 
   loadSettings(); //Load settings from EEPROM
+
+  //Use the current radio settings if they are already set
+  if (!settings.radioBandwidth)
+  {
+    //Set the initial radio parameters
+    getDefaultSettings(&settings);
+    recordSystemSettings();
+  }
+
   serialOperatingMode = settings.operatingMode;
 
   beginSerial(settings.serialSpeed);

Firmware/LoRaSerial/NVM.ino

@@ -3,6 +3,9 @@ void loadSettings()
 {
   arch.eepromBegin();
 
+  //Use the default settings
+  getDefaultSettings(&settings);
+
   //Check to see if EEPROM is blank
   uint32_t testRead = 0;
   if (EEPROM.get(0, testRead) == 0xFFFFFFFF)
@@ -55,6 +58,15 @@ void loadSettings()
   recordSystemSettings();
 }
 
+//Merge the default settings with the default radio settings
+void getDefaultSettings(Settings * newSettings)
+{
+  const Settings defaultSettings;
+
+  //Set the initial radio parameters
+  *newSettings = defaultSettings;
+}
+
 //Modify defaults for each radio type (915, 868, 433, etc)
 //Confirm various settings are within regulatory bounds
 void validateSettings()

Firmware/LoRaSerial/Train.ino

@@ -101,7 +101,7 @@ void beginTrainingServer()
 void commonTrainingInitialization()
 {
   //Use common radio settings between the client and server for training
-  settings = defaultSettings;
+  getDefaultSettings(&settings);
   settings.dataScrambling = true;           //Scramble the data
   settings.enableCRC16 = true;              //Use CRC-16
   settings.encryptData = true;              //Enable packet encryption