Merge branch 'release_candidate' of https://github.com/sparkfun/SparkFun_RTK_Firmware into release_candidate

Author: PaulZC

Firmware/RTK_Surveyor/NVM.ino

@@ -22,8 +22,8 @@ void loadSettings()
   //loadSystemSettingsFromFileLFS(settingsFileName, &settings); - Previously loaded during loadSettingsPartial()
   loadSystemSettingsFromFileSD(settingsFileName, &settings);
 
-  //Change default profile names to 'Profile1' etc
-  if (strcmp(settings.profileName, "Default") == 0)
+  //Change empty profile name to 'Profile1' etc
+  if (strcmp(settings.profileName, "(Empty)") == 0)
     sprintf(settings.profileName, "Profile%d", profileNumber + 1);
 
   //Record these settings to LittleFS and SD file to be sure they are the same

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -364,7 +364,7 @@ const char* pointPerfectKeyTopic = "/pp/ubx/0236/Lb";
 #if __has_include("tokens.h")
 #include "tokens.h"
 #else
-uint8_t pointPerfectTokenArray = {0xAA, 0xBB, 0xCC, 0xDD, 0x00, 0x11, 0x22, 0x33, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x01, 0x02, 0x03}; //Token in HEX form
+uint8_t pointPerfectTokenArray[] = {0xAA, 0xBB, 0xCC, 0xDD, 0x00, 0x11, 0x22, 0x33, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x01, 0x02, 0x03}; //Token in HEX form
 
 static const char *AWS_PUBLIC_CERT = R"=====(
 -----BEGIN CERTIFICATE-----

Firmware/RTK_Surveyor/States.ino

@@ -1386,6 +1386,7 @@ void requestChangeState(SystemState requestedState)
 //Change states and print the new state
 void changeState(SystemState newState)
 {
+  reportHeapNow();
   systemState = newState;
 
   //Debug print

Firmware/RTK_Surveyor/System.ino

@@ -60,6 +60,7 @@ void startBluetooth()
 #endif
 
     btState = BT_NOTCONNECTED;
+    reportHeapNow();
   }
 
 }
@@ -80,6 +81,7 @@ void stopBluetooth()
     log_d("Bluetooth turned off");
 
     btState = BT_OFF;
+    reportHeapNow();
   }
 }
 
@@ -93,6 +95,7 @@ void startWiFi(char* ssid, char* pw)
 #endif
 
     wifiState = WIFI_NOTCONNECTED;
+    reportHeapNow();
   }
 }
 
@@ -109,6 +112,7 @@ void stopWiFi()
 
     log_d("WiFi Stopped");
     wifiState = WIFI_OFF;
+    reportHeapNow();
   }
 }
 
@@ -576,15 +580,24 @@ bool createTestFile()
   return (false);
 }
 
+//If debug option is on, print available heap
+void reportHeapNow()
+{
+  if (settings.enableHeapReport == true)
+  {
+    lastHeapReport = millis();
+    Serial.printf("FreeHeap: %d / HeapLowestPoint: %d / LargestBlock: %d\n\r", ESP.getFreeHeap(), xPortGetMinimumEverFreeHeapSize(), heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
+  }
+}
+
 //If debug option is on, print available heap
 void reportHeap()
 {
   if (settings.enableHeapReport == true)
   {
     if (millis() - lastHeapReport > 1000)
     {
-      lastHeapReport = millis();
-      Serial.printf("FreeHeap: %d / HeapLowestPoint: %d / LargestBlock: %d\n\r", ESP.getFreeHeap(), xPortGetMinimumEverFreeHeapSize(), heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
+      reportHeapNow();
     }
   }
 }

Firmware/RTK_Surveyor/menuMain.ino

@@ -124,18 +124,19 @@ void menuUserProfiles()
     for (int x = 0 ; x < MAX_PROFILE_COUNT ; x++)
     {
       if (strlen(profileNames[x]) > 0)
-      {
         Serial.printf("%d) Select %s", x + 1, profileNames[x]);
-        if (x == profileNumber) Serial.print(" <- Current");
-      }
       else
         Serial.printf("%d) Select (Empty)", x + 1);
 
+      if (x == profileNumber) Serial.print(" <- Current");
+
       Serial.println();
     }
 
     Serial.printf("%d) Edit profile name: %s\n\r", MAX_PROFILE_COUNT + 1, profileNames[profileNumber]);
 
+    Serial.printf("%d) Delete profile '%s'\n\r", MAX_PROFILE_COUNT + 2, profileNames[profileNumber]);
+
     Serial.println(F("x) Exit"));
 
     int incoming = getNumber(menuTimeout); //Timeout after x seconds
@@ -164,6 +165,34 @@ void menuUserProfiles()
 
       strcpy(profileNames[profileNumber], settings.profileName); //Update array
     }
+    else if (incoming == MAX_PROFILE_COUNT + 2)
+    {
+      Serial.printf("\r\nDelete profile '%s'. Press 'y' to confirm:", profileNames[profileNumber]);
+      byte bContinue = getByteChoice(menuTimeout);
+      if (bContinue == 'y')
+      {
+        //Remove profile from LittleFS
+        if (LittleFS.exists(settingsFileName))
+          LittleFS.remove(settingsFileName);
+
+        //Remove profile from SD if available
+        if (online.microSD == true)
+        {
+          if (sd.exists(settingsFileName))
+            sd.remove(settingsFileName);
+        }
+
+        //Clear this profile profile with default settings
+        Settings tempSettings;
+        settings = tempSettings;
+
+        recordSystemSettings();
+
+        strcpy(profileNames[profileNumber], settings.profileName); //Update array
+      }
+      else
+        Serial.println(F("Delete aborted"));
+    }
 
     else if (incoming == STATUS_PRESSED_X)
       break;

Firmware/RTK_Surveyor/menuSystem.ino

@@ -289,6 +289,8 @@ void menuDebug()
     }
     else if (incoming == 'r')
     {
+      recordSystemSettings();
+      
       ESP.restart();
     }
     else if (incoming == 't')

Firmware/RTK_Surveyor/settings.h

@@ -336,7 +336,7 @@ typedef struct {
   };
 
   int maxLogLength_minutes = 60 * 24; //Default to 24 hours
-  char profileName[50] = "Default";
+  char profileName[50] = "(Empty)";
 
   //NTRIP Server
   bool enableNtripServer = false;