Fix profile assignment if empty profile exists. Add delete profile.

Author: nseidle

Firmware/RTK_Surveyor/Display.ino

@@ -1484,6 +1484,8 @@ void paintProfile(uint8_t profileUnit)
     uint8_t profileNumber = getProfileNumberFromUnit(profileUnit);
     recordProfileNumber(profileNumber); //Update internal settings with user's choice, mark unit for config update
 
+    log_d("Going to profile number %d from unit %d, name '%s'", profileNumber, profileUnit, profileName);
+
     snprintf(profileMessage, sizeof(profileMessage), "Loading %s", profileName);
     displayMessage(profileMessage, 2000);
     ESP.restart(); //Profiles require full restart to take effect

Firmware/RTK_Surveyor/NVM.ino

@@ -23,7 +23,7 @@ void loadSettings()
   loadSystemSettingsFromFileSD(settingsFileName, &settings);
 
   //Change empty profile name to 'Profile1' etc
-  if (strcmp(settings.profileName, "(Empty)") == 0)
+  if (strlen(settings.profileName) == 0)
     sprintf(settings.profileName, "Profile%d", profileNumber + 1);
 
   //Record these settings to LittleFS and SD file to be sure they are the same
@@ -873,9 +873,7 @@ uint8_t loadProfileNames()
   for (int x = 0 ; x < MAX_PROFILE_COUNT ; x++)
     profileNames[x][0] = '\0'; //Ensure every profile name is terminated
 
-  //Serial.printf("sizeof(Settings): %d\n\r", sizeof(Settings));
-
-  //Check LittleFS for profile names
+  //Check LittleFS and SD for profile names
   for (int x = 0 ; x < MAX_PROFILE_COUNT ; x++)
   {
     char fileName[40];
@@ -885,11 +883,11 @@ uint8_t loadProfileNames()
       profileCount++;
   }
 
-  //    Serial.printf("profileCount: %d\n\r", profileCount);
-  //    Serial.println("Profiles:");
-  //    for (int x = 0 ; x < MAX_PROFILE_COUNT ; x++)
-  //      Serial.printf("%d) %s\n\r", x, profileNames[x]);
-  //    Serial.println();
+//  Serial.printf("profileCount: %d\n\r", profileCount);
+//  Serial.println("Profiles:");
+//  for (int x = 0 ; x < MAX_PROFILE_COUNT ; x++)
+//    Serial.printf("%d) %s\n\r", x, profileNames[x]);
+//  Serial.println();
 
   return (profileCount);
 }
@@ -953,16 +951,14 @@ uint8_t getProfileNumberFromUnit(uint8_t profileUnit)
     if (strlen(profileNames[x]) > 0)
     {
       if (located == profileUnit)
-      {
-        return (located);
-      }
+        return (x);
 
       located++; //Valid settingFileName but not the unit we are looking for
     }
   }
   log_d("Profile unit %d not found", profileUnit);
 
-  return (false);
+  return (0);
 }
 
 //Record large character blob to file

Firmware/RTK_Surveyor/menuMain.ino

@@ -149,13 +149,7 @@ void menuUserProfiles()
       recordProfileNumber(incoming - 1); //Align to array
       profileNumber = incoming - 1;
 
-      sprintf(settingsFileName, "/%s_Settings_%d.txt", platformFilePrefix, profileNumber); //Update file name with new profileNumber
-
-      //Start this profile with default settings
-      Settings tempSettings;
-      settings = tempSettings;
-
-      recordSystemSettings();
+      sprintf(settingsFileName, "/%s_Settings_%d.txt", platformFilePrefix, profileNumber); //Enables Delete Profile
     }
     else if (incoming == MAX_PROFILE_COUNT + 1)
     {
@@ -182,13 +176,12 @@ void menuUserProfiles()
             sd.remove(settingsFileName);
         }
 
-        //Clear this profile profile with default settings
-        Settings tempSettings;
-        settings = tempSettings;
+        recordProfileNumber(0); //Move to Profile1
+        profileNumber = 0;
 
-        recordSystemSettings();
+        sprintf(settingsFileName, "/%s_Settings_%d.txt", platformFilePrefix, profileNumber); //Update file name with new profileNumber
 
-        strcpy(profileNames[profileNumber], settings.profileName); //Update array
+        activeProfiles = loadProfileNames(); //Count is used during menu display
       }
       else
         Serial.println(F("Delete aborted"));

Firmware/RTK_Surveyor/settings.h

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