Move EEPROM settings access so we can check enableResetDisplay setting. Move resetCount to purely NVM (no file).

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -38,7 +38,7 @@ void beginBoard()
 
     //Bug in ZED-F9P v1.13 firmware causes RTK LED to not light when RTK Floating with SBAS on.
     //The following changes the POR default but will be overwritten by settings in NVM or settings file
-    ubxConstellations[1].enabled = false; 
+    ubxConstellations[1].enabled = false;
 
     strcpy(platformFilePrefix, "SFE_Surveyor");
     strcpy(platformPrefix, "Surveyor");
@@ -112,14 +112,25 @@ void beginBoard()
   if (esp_reset_reason() == ESP_RST_POWERON)
   {
     reuseLastLog = false; //Start new log
-    settings.resetCount = 0;
-    recordSystemSettings(); //Record to NVM
+
+    loadSettingsPartial();
+    if (settings.enableResetDisplay == true)
+    {
+      settings.resetCount = 0;
+      recordSystemSettings(); //Record to NVM
+    }
   }
   else
   {
     reuseLastLog = true; //Attempt to reuse previous log
-    settings.resetCount++;
-    recordSystemSettings(); //Record to NVM
+
+    loadSettingsPartial();
+    if (settings.enableResetDisplay == true)
+    {
+      settings.resetCount++;
+      recordSystemSettings(); //Record to NVM
+      Serial.printf("resetCount: %d\n\r", settings.resetCount);
+    }
 
     Serial.print("Reset reason: ");
     switch (esp_reset_reason())
@@ -336,6 +347,7 @@ void beginGNSS()
 
     printModuleInfo(); //Print module type and firmware version
   }
+
   online.gnss = true;
 }
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -147,10 +147,6 @@ uint32_t casterResponseWaitStartTime = 0; //Used to detect if caster service tim
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <SparkFun_u-blox_GNSS_Arduino_Library.h> //http://librarymanager/All#SparkFun_u-blox_GNSS
 
-//Note: There are two prevalent versions of the ZED-F9P: v1.12 (part# -01B) and v1.13 (-02B).
-//v1.13 causes the RTK LED to not function if SBAS is enabled. To avoid this, we
-//disable SBAS by default.
-
 char zedFirmwareVersion[20]; //The string looks like 'HPG 1.12'. Output to debug menu and settings file.
 uint8_t zedModuleType = PLATFORM_F9P; //Controls which messages are supported and configured
 
@@ -221,7 +217,7 @@ uint8_t rBuffer[SERIAL_SIZE_RX]; //Buffer for reading from F9P to SPP
 uint8_t wBuffer[SERIAL_SIZE_RX]; //Buffer for writing from incoming SPP to F9P
 TaskHandle_t F9PSerialReadTaskHandle = NULL; //Store handles so that we can kill them if user goes into WiFi NTRIP Server mode
 TaskHandle_t F9PSerialWriteTaskHandle = NULL; //Store handles so that we can kill them if user goes into WiFi NTRIP Server mode
-const uint8_t F9PSerialWriteTaskPriority = 1; //Priority, with 3 being the highest, and 0 being the lowest.
+const uint8_t F9PSerialWriteTaskPriority = 1; //3 being the highest, and 0 being the lowest.
 const uint8_t F9PSerialReadTaskPriority = 1;
 
 TaskHandle_t pinUART2TaskHandle = NULL; //Dummy task to start UART2 on core 0.
@@ -275,7 +271,7 @@ Button *setupBtn = NULL; //We can't instantiate the buttons here because we don'
 Button *powerBtn = NULL;
 
 TaskHandle_t ButtonCheckTaskHandle = NULL;
-const uint8_t ButtonCheckTaskPriority = 1; //Priority, with 3 being the highest, and 0 being the lowest.
+const uint8_t ButtonCheckTaskPriority = 1; //3 being the highest, and 0 being the lowest.
 const int buttonTaskStackSize = 2000;
 
 const int shutDownButtonTime = 2000; //ms press and hold before shutdown
@@ -360,20 +356,19 @@ void setup()
   Serial.begin(115200); //UART0 for programming and debugging
 
   Wire.begin(); //Start I2C on core 1
-  Wire.setClock(400000);
+  //Wire.setClock(400000);
+  Wire.setClock(100000);
 
   beginGNSS(); //Connect to GNSS
 
+  beginEEPROM(); //Start EEPROM and SD for settings
+
   beginBoard(); //Determine what hardware platform we are running on
 
   beginDisplay(); //Check if an external Qwiic OLED is attached
 
   beginLEDs(); //LED and PWM setup
 
-  //Start EEPROM and SD for settings, and display for output
-  //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  beginEEPROM();
-
   //eepromErase();
 
   beginSD(); //Test if SD is present
@@ -384,7 +379,6 @@ void setup()
   }
 
   loadSettings(); //Attempt to load settings after SD is started so we can read the settings file if available
-  //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
   beginUART2(); //Start UART2 on core 0, used to receive serial from ZED and pass out over SPP
 

Firmware/RTK_Surveyor/Tasks.ino

@@ -1,4 +1,4 @@
-//High frequency tasks made by createTask()
+//High frequency tasks made by xTaskCreate()
 //And any low frequency tasks that are called by Ticker
 
 //If the phone has any new data (NTRIP RTCM, etc), read it in over Bluetooth and pass along to ZED

Firmware/RTK_Surveyor/menuDebug.ino

@@ -38,6 +38,8 @@ void menuDebug()
     if (settings.enableResetDisplay == true) Serial.println(F("Enabled"));
     else Serial.println(F("Disabled"));
 
+    Serial.println(F("r) Force system reset"));
+
     Serial.println(F("x) Exit"));
 
     byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
@@ -105,6 +107,15 @@ void menuDebug()
     else if (incoming == '8')
     {
       settings.enableResetDisplay ^= 1;
+      if (settings.enableResetDisplay == true)
+      {
+        settings.resetCount = 0;
+        recordSystemSettings(); //Record to NVM
+      }
+    }
+    else if (incoming == 'r')
+    {
+      ESP.restart();
     }
     else if (incoming == 'x')
       break;