Merge branch 'main' into release_candidate

Author: nseidle

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -40,7 +40,7 @@ void menuFirmware()
     while (1)
     {
         systemPrintln();
-        systemPrintln("Menu: Update Firmware");
+        systemPrintln("Menu: Firmware Update");
 
         if (btPrintEcho == true)
             systemPrintln("Firmware update not available while configuration over Bluetooth is active");
@@ -66,8 +66,11 @@ void menuFirmware()
         if (settings.enableAutoFirmwareUpdate)
             systemPrintf("i) Automatic firmware check minutes: %d\r\n", settings.autoFirmwareCheckMinutes);
 
-        systemPrintf("r) Change RC Firmware JSON URL: %s\r\n", otaRcFirmwareJsonUrl);
-        systemPrintf("s) Change Firmware JSON URL: %s\r\n", otaFirmwareJsonUrl);
+        if (ENABLE_DEVELOPER)
+        {
+            systemPrintf("r) Change RC Firmware JSON URL: %s\r\n", otaRcFirmwareJsonUrl);
+            systemPrintf("s) Change Firmware JSON URL: %s\r\n", otaFirmwareJsonUrl);
+        }
 
         if (newOTAFirmwareAvailable)
             systemPrintf("u) Update to new firmware: v%s\r\n", reportedVersion);
@@ -181,13 +184,13 @@ void menuFirmware()
             getNewSetting("Enter minutes before next firmware check", 1, 999999, &settings.autoFirmwareCheckMinutes);
         }
 
-        else if (incoming == 'r')
+        else if ((incoming == 'r') && (ENABLE_DEVELOPER == true))
         {
             systemPrint("Enter RC Firmware JSON URL (empty to use default): ");
             memset(otaRcFirmwareJsonUrl, 0, sizeof(otaRcFirmwareJsonUrl));
             getUserInputString(otaRcFirmwareJsonUrl, sizeof(otaRcFirmwareJsonUrl) - 1);
         }
-        else if (incoming == 's')
+        else if ((incoming == 's') && (ENABLE_DEVELOPER == true))
         {
             systemPrint("Enter Firmware JSON URL (empty to use default): ");
             memset(otaFirmwareJsonUrl, 0, sizeof(otaFirmwareJsonUrl));

Firmware/RTK_Everywhere/menuMain.ino

@@ -97,7 +97,7 @@ void menuMain()
             systemPrintln("e) Configure Ethernet");
 #endif // COMPILE_ETHERNET
 
-        systemPrintln("f) Firmware upgrade");
+        systemPrintln("f) Firmware Update");
 
         systemPrintln("i) Configure Corrections Priorities");
 
@@ -106,15 +106,15 @@ void menuMain()
             systemPrintln("n) Configure NTP");
 #endif // COMPILE_ETHERNET
 
-        systemPrintln("p) Configure User Profiles");
+        systemPrintln("u) Configure User Profiles");
 
 #ifdef COMPILE_ESPNOW
         systemPrintln("r) Configure Radios");
 #else  // COMPILE_ESPNOW
         systemPrintln("r) **ESP-Now Not Compiled**");
 #endif // COMPILE_ESPNOW
 
-        systemPrintln("P) Configure PointPerfect");
+        systemPrintln("p) Configure PointPerfect");
 
         systemPrintln("s) Configure System");
 
@@ -152,9 +152,9 @@ void menuMain()
             menuCorrectionsPriorities();
         else if (incoming == 'n' && (present.ethernet_ws5500 == true))
             menuNTP();
-        else if (incoming == 'p')
+        else if (incoming == 'u')
             menuUserProfiles();
-        else if (incoming == 'P')
+        else if (incoming == 'p')
             menuPointPerfect();
 #ifdef COMPILE_ESPNOW
         else if (incoming == 'r')