Merge pull request #496 from LeeLeahy2/move-settings

Move settings into LoRaSerial with other settings

Author: nseidle

Firmware/LoRaSerial/LoRaSerial.ino

@@ -509,6 +509,7 @@ unsigned long retransmitTimeout = 0; //Throttle back re-transmits
 //Global variables
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 const Settings defaultSettings;
+Settings settings; //Active settings used by the radio
 Settings tempSettings; //Create a duplicate of settings during training so that we can resort as needed
 
 char platformPrefix[25]; //Used for printing platform specific device name, ie "SAMD21 1W 915MHz"

Firmware/LoRaSerial/settings.h

@@ -19,7 +19,7 @@ typedef enum
   RADIO_DISCOVER_SCANNING,
   RADIO_DISCOVER_WAIT_TX_FIND_PARTNER_DONE,
   RADIO_DISCOVER_STANDBY,
-  
+
   //Multi-Point: Datagrams
   RADIO_MP_STANDBY,
   RADIO_MP_WAIT_TX_DONE,
@@ -518,7 +518,6 @@ typedef struct struct_settings {
   //-- Add commands to set the parameters
   //-- Add parameters to routine updateRadioParameters
 } Settings;
-Settings settings;
 
 //Monitor which devices on the device are on or offline.
 struct struct_online {