Fix NVM testing

Author: nseidle

Firmware/LoRaSerial_Firmware/Commands.ino

@@ -34,7 +34,7 @@ void checkCommand()
       case ('I'):
         //Shows the radio version
         reportOK();
-        systemPrint("SparkFun STR ");
+        systemPrint("SparkFun LoRaSerial ");
         systemPrint(platformPrefix);
         systemPrint(" v");
         systemPrint(FIRMWARE_VERSION_MAJOR);
@@ -93,7 +93,7 @@ void checkCommand()
         displayParameters();
         break;
       case ('1'): //ATI1 - Show board variant
-        systemPrint("SparkFun STR ");
+        systemPrint("SparkFun LoRaSerial ");
         systemPrint(platformPrefix);
         systemPrint("\r\n");
         break;

Firmware/LoRaSerial_Firmware/LoRaSerial_Firmware.ino

@@ -218,9 +218,6 @@ void setup()
 
   beginBoard(); //Determine what hardware platform we are running on
 
-  //settings.airSpeed = 19200;
-  //settings.debug = true; //Enable trigger pin events
-
   beginLoRa(); //Start radio
 
   beginButton(); //Start watching the train button

Firmware/LoRaSerial_Firmware/NVM.ino

@@ -14,7 +14,7 @@ void loadSettings()
 
   //Check that the current settings struct size matches what is stored in EEPROM
   //Misalignment happens when we add a new feature or setting
-  int tempSize = 0;
+  uint16_t tempSize = 0;
   EEPROM.get(0, tempSize); //Load the sizeOfSettings
   if (tempSize != sizeof(settings))
   {
@@ -23,13 +23,11 @@ void loadSettings()
   }
 
   //Check that the strIdentifier is correct
-  int tempIdentifier = 0;
-  EEPROM.get(sizeof(int), tempIdentifier); //Load the identifier from the EEPROM location after sizeOfSettings (int)
+  uint16_t tempIdentifier = 0;
+  EEPROM.get(sizeof(tempSize), tempIdentifier); //Load the identifier from the EEPROM location after sizeOfSettings (int)
   if (tempIdentifier != LRS_IDENTIFIER)
   {
-    //systemPrint("Settings are not valid for this variant of STR ");
-    //systemPrint((String)platformPrefix);
-    //systemPrintln(". Default settings applied.");
+    //systemPrint("Settings are not valid for this variant of LoRaSerial. Default settings applied.");
     recordSystemSettings(); //Record default settings to EEPROM. At power on, settings are in default state
   }
 

Firmware/LoRaSerial_Firmware/Radio.ino

@@ -318,7 +318,7 @@ void configureRadio()
       systemPrintln("Radio init failed. Check settings.");
     }
   }
-  LRS_DEBUG_PRINTLN("Radio online");
+  LRS_DEBUG_PRINTLN("Radio configured");
 }
 
 void returnToReceiving()