Make getProfileNumberFromUnit return -1 on fail

Also fix NTP clock blinking

Author: PaulZC

Firmware/RTK_Everywhere/Display.ino

@@ -1308,14 +1308,17 @@ void paintHorizontalAccuracy(displayCoords textCoords)
 // Display clock with moving hands
 void paintClock(std::vector<iconPropertyBlinking> *iconList, bool blinking)
 {
-    // Animate icon to show system running
-    static uint8_t clockIconDisplayed = CLOCK_ICON_STATES - 1;
-    clockIconDisplayed++;                    // Goto next icon
-    clockIconDisplayed %= CLOCK_ICON_STATES; // Wrap
+    // Animate icon to show system running. The 2* makes the blink correct
+    static uint8_t clockIconDisplayed = (2 * CLOCK_ICON_STATES) - 1;
+    clockIconDisplayed++; // Goto next icon
+    clockIconDisplayed %= (2 * CLOCK_ICON_STATES); // Wrap
 
     iconPropertyBlinking prop;
-    prop.icon = ClockIconProperties.iconDisplay[clockIconDisplayed][present.display_type];
-    prop.duty = 0b01010101;
+    prop.icon = ClockIconProperties.iconDisplay[clockIconDisplayed / 2][present.display_type];
+    if (blinking)
+        prop.duty = 0b01010101;
+    else
+        prop.duty = 0b11111111;
     iconList->push_back(prop);
 
     displayCoords textCoords;
@@ -2257,19 +2260,29 @@ void paintProfile(uint8_t profileUnit)
     if (getProfileNameFromUnit(profileUnit, profileName, sizeof(profileName)) ==
         true) // Load the profile name, limited to 8 chars
     {
-        settings.updateGNSSSettings = true; // When this profile is loaded next, force system to update GNSS settings.
-        recordSystemSettings(); // Before switching, we need to record the current settings to LittleFS and SD
+        // Lookup profileNumber based on unit.
+        // getProfileNumberFromUnit should not fail (return -1), because we have already called getProfileNameFromUnit.
+        int8_t profileNumber = getProfileNumberFromUnit(profileUnit);
 
-        // Lookup profileNumber based on unit
-        uint8_t profileNumber = getProfileNumberFromUnit(profileUnit);
-        recordProfileNumber(profileNumber); // Update internal settings with user's choice, mark unit for config update
+        if (profileNumber >= 0)
+        {
+            settings.updateGNSSSettings = true; // When this profile is loaded next, force system to update GNSS settings.
+            recordSystemSettings(); // Before switching, we need to record the current settings to LittleFS and SD
 
-        log_d("Going to profile number %d from unit %d, name '%s'", profileNumber, profileUnit, profileName);
+            recordProfileNumber((uint8_t)profileNumber); // Update internal settings with user's choice, mark unit for config update
 
-        snprintf(profileMessage, sizeof(profileMessage), "Loading %s", profileName);
-        displayMessage(profileMessage, 2000);
-        ESP.restart(); // Profiles require full restart to take effect
+            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
+        }
     }
+
+    log_d("Cannot go to profileUnit %d. No profile name / number. Restarting...", profileUnit);
+    snprintf(profileMessage, sizeof(profileMessage), "Invalid profile%d", profileUnit);
+    displayMessage(profileMessage, 2000);
+    ESP.restart(); // Something bad happened. Restart...
 }
 
 // Display unit self-tests until user presses a button to exit

Firmware/RTK_Everywhere/NVM.ino

@@ -1888,8 +1888,8 @@ bool getProfileNameFromUnit(uint8_t profileUnit, char *profileName, uint8_t prof
 
 // Return profile number based on units
 // Profiles may not be sequential (user might have empty profile #2, but filled #3) so we look up the profile unit and
-// return the count
-uint8_t getProfileNumberFromUnit(uint8_t profileUnit)
+// return the count. Return -1 if profileUnit is not found.
+int8_t getProfileNumberFromUnit(uint8_t profileUnit)
 {
     uint8_t located = 0;
 
@@ -1906,7 +1906,7 @@ uint8_t getProfileNumberFromUnit(uint8_t profileUnit)
     }
     log_d("Profile unit %d not found", profileUnit);
 
-    return (0);
+    return (-1);
 }
 
 // Record large character blob to file

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -175,7 +175,7 @@ TwoWire *i2cDisplay = nullptr;
 
 #define MAX_PROFILE_COUNT 8
 uint8_t activeProfiles;                    // Bit vector indicating which profiles are active
-uint8_t displayProfile;                    // Range: 0 - (MAX_PROFILE_COUNT - 1)
+uint8_t displayProfile;                    // Profile Unit - Range: 0 - (MAX_PROFILE_COUNT - 1)
 uint8_t profileNumber = MAX_PROFILE_COUNT; // profileNumber gets set once at boot to save loading time
 char profileNames[MAX_PROFILE_COUNT][50];  // Populated based on names found in LittleFS and SD
 char settingsFileName[60];                 // Contains the %s_Settings_%d.txt with current profile number set

Firmware/RTK_Everywhere/States.ino

@@ -1238,17 +1238,17 @@ void constructSetupDisplay(std::vector<setupButton> *buttons)
     }
     addSetupButton(buttons, "E-Pair", STATE_ESPNOW_PAIRING_NOT_STARTED);
     // If only one active profile do not show any profiles
-    if (getProfileNumberFromUnit(1) > 0)
+    if (getProfileNumberFromUnit(1) >= 0)
     {
         for (int x = 0; x < MAX_PROFILE_COUNT; x++)
         {
-            int activeProfile = getProfileNumberFromUnit(x);
-            if ((x == 0) || (activeProfile > 0))
+            int profile = getProfileNumberFromUnit(x);
+            if (profile >= 0)
             {
                 setupButton button;
-                button.name = &profileNames[activeProfile][0];
+                button.name = &profileNames[profile][0];
                 button.newState = STATE_PROFILE;
-                button.newProfile = x;
+                button.newProfile = x; // paintProfile needs the unit
                 buttons->push_back(button);
             }
         }

Firmware/RTK_Everywhere/Tasks.ino

@@ -1490,8 +1490,8 @@ void buttonCheckTask(void *e)
 
                                 if (theButton.newState == STATE_PROFILE)
                                 {
-                                    displayProfile = theButton.newProfile;
-                                    requestChangeState(theButton.newState);
+                                    displayProfile = theButton.newProfile; // paintProfile needs the unit
+                                    requestChangeState(STATE_PROFILE);
                                 }
                                 else if (theButton.newState == STATE_NOT_SET) // Exit
                                     requestChangeState(lastSystemState);