Test for online EEPROM before accessing.

Author: nseidle

Firmware/RTK_Surveyor/NVM.ino

@@ -1,5 +1,11 @@
 void loadSettings()
 {
+  if (online.eeprom == false)
+  {
+    ESP_LOGD(TAG, "Error: EEPROM not online");
+    return;
+  }
+
   //First load any settings from NVM
   //After, we'll load settings from config file if available
   //We'll then re-record settings so that the settings from the file over-rides internal NVM settings
@@ -41,25 +47,44 @@ void loadSettings()
   recordSystemSettings();
 }
 
+//Load settings without recording 
+//Used at very first boot to test for resetCounter
+void loadSettingsPartial()
+{
+  if (online.eeprom == false)
+  {
+    ESP_LOGD(TAG, "Error: EEPROM not online");
+    return;
+  }
+
+  //Check to see if EEPROM is blank
+  uint32_t testRead = 0;
+  if (EEPROM.get(0, testRead) == 0xFFFFFFFF)
+    return; //EEPROM is blank, assume default settings
+  
+  EEPROM.get(0, settings); //Read current settings
+}
+
 //Record the current settings struct to EEPROM and then to config file
 void recordSystemSettings()
 {
   settings.sizeOfSettings = sizeof(settings);
   if (settings.sizeOfSettings > EEPROM_SIZE)
   {
-    displayError("EEPROM");
+    Serial.printf("Size of settings is %d bytes\n\r", sizeof(settings));
+    Serial.println(F("Increase the EEPROM footprint!"));
+    displayError("EEPROM"); //Hard freeze
+  }
 
-    while (1) //Hard freeze
-    {
-      Serial.printf("Size of settings is %d bytes\n\r", sizeof(settings));
-      Serial.println(F("Increase the EEPROM footprint!"));
-      delay(1000);
-    }
+  if (online.eeprom == true)
+  {
+    EEPROM.put(0, settings);
+    EEPROM.commit();
+    delay(1); //Give CPU time to pet WDT
   }
+  else
+    ESP_LOGD(TAG, "Error: EEPROM not online");
 
-  EEPROM.put(0, settings);
-  EEPROM.commit();
-  delay(1); //Give CPU time to pet WDT
   recordSystemSettingsToFile();
 }
 
@@ -142,7 +167,6 @@ void recordSystemSettingsToFile()
       settingsFile.println("enableSensorFusion=" + (String)settings.enableSensorFusion);
       settingsFile.println("autoIMUmountAlignment=" + (String)settings.autoIMUmountAlignment);
       settingsFile.println("enableResetDisplay=" + (String)settings.enableResetDisplay);
-      settingsFile.println("resetCount=" + (String)settings.resetCount);
 
       //Record constellation settings
       for (int x = 0 ; x < MAX_CONSTELLATIONS ; x++)
@@ -411,8 +435,6 @@ bool parseLine(char* str) {
     settings.autoIMUmountAlignment = d;
   else if (strcmp(settingName, "enableResetDisplay") == 0)
     settings.enableResetDisplay = d;
-  else if (strcmp(settingName, "resetCount") == 0)
-    settings.resetCount = d;
 
   //Check for bulk settings (constellations and message rates)
   //Must be last on else list