Merge branch 'release_candidate' into nvm-cmd

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/src/main.js

@@ -760,14 +760,14 @@ function validateFields() {
         checkElementValue("autoFirmwareCheckMinutes", 1, 999999, "Must be 1 to 999999", "collapseSystemConfig");
     }
     else {
-        clearElement("autoFirmwareCheckMinutes", 1440);
+        clearElement("autoFirmwareCheckMinutes", 0);
     }
 
     if (ge("enableAutoReset").checked == true) {
         checkElementValue("rebootMinutes", 1, 999999, "Must be 1 to 999999", "collapseSystemConfig");
     }
     else {
-        clearElement("rebootMinutes", 1440);
+        clearElement("rebootMinutes", 0); //0 = disable
     }
 
 

Firmware/RTK_Everywhere/Form.ino

@@ -843,12 +843,12 @@ void createMessageList(String &returnText)
     {
         for (int messageNumber = 0; messageNumber < MAX_UM980_NMEA_MSG; messageNumber++)
         {
-            returnText += "um980MessageRatesNMEA_" + String(umMessagesNMEA[messageNumber].msgTextName) + "," +
+            returnText += "messageRateNMEA_" + String(umMessagesNMEA[messageNumber].msgTextName) + "," +
                           String(settings.um980MessageRatesNMEA[messageNumber]) + ",";
         }
         for (int messageNumber = 0; messageNumber < MAX_UM980_RTCM_MSG; messageNumber++)
         {
-            returnText += "um980MessageRatesRTCMRover_" + String(umMessagesRTCM[messageNumber].msgTextName) + "," +
+            returnText += "messageRateRTCMRover_" + String(umMessagesRTCM[messageNumber].msgTextName) + "," +
                           String(settings.um980MessageRatesRTCMRover[messageNumber]) + ",";
         }
     }
@@ -879,7 +879,7 @@ void createMessageListBase(String &returnText)
     {
         for (int messageNumber = 0; messageNumber < MAX_UM980_RTCM_MSG; messageNumber++)
         {
-            returnText += "messageRatesRTCMBase_" + String(umMessagesRTCM[messageNumber].msgTextName) + "," +
+            returnText += "messageRateRTCMBase_" + String(umMessagesRTCM[messageNumber].msgTextName) + "," +
                           String(settings.um980MessageRatesRTCMBase[messageNumber]) + ",";
         }
     }

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -1150,20 +1150,8 @@ void setup()
 
 void loop()
 {
-    static uint32_t lastPeriodicDisplay;
-
-    // Determine which items are periodically displayed
-    if ((millis() - lastPeriodicDisplay) >= settings.periodicDisplayInterval)
-    {
-        lastPeriodicDisplay = millis();
-        periodicDisplay = settings.periodicDisplay;
-
-        // Reboot the system after a specified timeout
-        if (((lastPeriodicDisplay / (1000 * 60)) > settings.rebootMinutes) && (!inMainMenu))
-            ESP.restart();
-    }
-    if (deadManWalking)
-        periodicDisplay = (PeriodicDisplay_t)-1;
+    DMW_c("periodicDisplay");
+    updatePeriodicDisplay();
 
     DMW_c("gnssUpdate");
     gnssUpdate();
@@ -1501,6 +1489,28 @@ void updateRadio()
 #endif // COMPILE_ESPNOW
 }
 
+void updatePeriodicDisplay()
+{
+    static uint32_t lastPeriodicDisplay;
+
+    // Determine which items are periodically displayed
+    if ((millis() - lastPeriodicDisplay) >= settings.periodicDisplayInterval)
+    {
+        lastPeriodicDisplay = millis();
+        periodicDisplay = settings.periodicDisplay;
+
+        // Reboot the system after a specified timeout
+        if ((lastPeriodicDisplay / (1000 * 60)) > settings.rebootMinutes)
+        {
+            systemPrintln("Automatic system reset");
+            delay(50); // Allow print to complete
+            ESP.restart();
+        }
+    }
+    if (deadManWalking)
+        periodicDisplay = (PeriodicDisplay_t)-1;
+}
+
 // Record who is holding the semaphore
 volatile SemaphoreFunction semaphoreFunction = FUNCTION_NOT_SET;
 

Firmware/RTK_Everywhere/menuCommands.ino

@@ -436,7 +436,8 @@ void commandSplitName(const char *settingName, char *truncatedName, int truncate
     }
 }
 
-// Lookup up setting name
+
+// Using the settingName string, return the index of the setting within command array
 int commandLookupSettingName(bool inCommands, const char *settingName, char *truncatedName, int truncatedNameLen, char *suffix,
                              int suffixLen)
 {
@@ -1166,6 +1167,15 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
         knownSetting = commandCheckForUnknownVariable(settingName, table, tableEntries);
     }
 
+    // If we've received a setting update for a setting that is not valid to this platform,
+    // allow it, but throw a warning.
+    // This is often caused by the Web Config page reporting all cells including
+    // those that are hidden because of platform limitations
+    if (knownSetting == true && settingAvailableOnPlatform(i) == false)
+    {
+        systemPrintf("Setting '%s' stored but not supported on this platform\r\n", settingName);
+    }
+
     // Last catch
     if (knownSetting == false)
     {

Firmware/RTK_Everywhere/menuSystem.ino

@@ -758,7 +758,7 @@ void menuDebugSoftware()
         systemPrintf("%s\r\n", settings.enablePrintDuplicateStates ? "Enabled" : "Disabled");
 
         systemPrint("32) Automatic device reboot in minutes: ");
-        if (settings.rebootMinutes > 4294967)
+        if (settings.rebootMinutes == 0)
             systemPrintln("Disabled");
         else
         {
@@ -830,7 +830,7 @@ void menuDebugSoftware()
             {
                 if (rebootMinutes < 1 || rebootMinutes > 4294967) // Disable the reboot
                 {
-                    settings.rebootMinutes = (uint32_t)-1;
+                    settings.rebootMinutes = 0;
                     systemPrintln("Reset is disabled");
                 }
                 else

Firmware/RTK_Everywhere/settings.h

@@ -1187,7 +1187,7 @@ struct Settings
     bool printPartitionTable = false;
     bool printTaskStartStop = false;
     uint16_t psramMallocLevel = 40; // By default, push as much as possible to PSRAM. Needed to do secure WiFi (MQTT) + BT + PPL
-    uint32_t rebootMinutes = (uint32_t)-1; // Disabled, reboots after uptime reaches this number of minutes
+    uint32_t rebootMinutes = 0; // Disabled, reboots after uptime reaches this number of minutes
     int resetCount = 0;
 
     // Periodic Display