Merge branch 'release_candidate' into pcUpdates

Author: PaulZC

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -362,16 +362,18 @@
                                 <span class="icon-info-circle text-primary ms-2"></span>
                             </span>
                         </div>
-                        <div class="form-group row">
-                            <label for="configurePPP" class="box-margin20 col-sm-3 col-5 col-form-label">Configure PPP:
-                                <span class="tt" data-bs-placement="right"
-                                    title="The configuration string for PPP. Enter values separated by spaces, not commas. Default: 2 1 120 0.10 0.15">
-                                    <span class="icon-info-circle text-primary ms-2"></span>
-                                </span>
-                            </label>
-                            <div class="col-sm-8 col-6">
-                                <input type="text" class="form-control" id="configurePPP">
-                                <p id="configurePPPError" class="inlineError"></p>
+                        <div id="configurePppSetting">
+                            <div class="form-group row">
+                                <label for="configurePPP" class="box-margin20 col-sm-3 col-5 col-form-label">Configure PPP:
+                                    <span class="tt" data-bs-placement="right"
+                                        title="The configuration string for PPP. Enter values separated by spaces, not commas. Default: 2 1 120 0.10 0.15">
+                                        <span class="icon-info-circle text-primary ms-2"></span>
+                                    </span>
+                                </label>
+                                <div class="col-sm-8 col-6">
+                                    <input type="text" class="form-control" id="configurePPP">
+                                    <p id="configurePPPError" class="inlineError"></p>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -78,6 +78,8 @@ const CoordinateTypes = {
 var convertedCoordinate = 0.0;
 var coordinateInputType = CoordinateTypes.COORDINATE_INPUT_TYPE_DD;
 
+var initialSettings = {};
+
 function parseIncoming(msg) {
     //console.log("Incoming message: " + msg);
 
@@ -226,6 +228,9 @@ function parseIncoming(msg) {
                 hide("constellationSbas"); //Not supported on UM980
                 hide("constellationNavic"); //Not supported on UM980
 
+                show("galileoHasSetting");
+                hide("lg290pGnssSettings");
+
                 show("measurementRateInput");
 
                 show("loraConfig");
@@ -326,7 +331,7 @@ function parseIncoming(msg) {
                 hide("logToSDCard"); //No SD card on Torch
 
                 hide("constellationSbas"); //Not supported on LG290P
-                show("constellationNavic"); 
+                show("constellationNavic");
                 show("galileoHasSetting");
                 show("lg290pGnssSettings");
                 hide("tiltConfig"); //Not supported on Torch X2
@@ -711,6 +716,7 @@ function parseIncoming(msg) {
         ge("enableARPLogging").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoFirmwareUpdate").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoReset").dispatchEvent(new CustomEvent('change'));
+        ge("enableGalileoHas").dispatchEvent(new CustomEvent('change'));
 
         updateECEFList();
         updateGeodeticList();
@@ -720,9 +726,38 @@ function parseIncoming(msg) {
         dhcpEthernet();
         updateLatLong();
         updateCorrectionsPriorities();
+
+        // Create copy of settings, send only changes when 'Save Configuration' is pressed
+        saveInitialSettings(); 
     }
 }
 
+// Save the current state of settings
+function saveInitialSettings() {
+    initialSettings = {}; // Clear previous settings
+
+    // Save input boxes and dropdowns
+    var clsElements = document.querySelectorAll(".form-control, .form-dropdown");
+    for (let x = 0; x < clsElements.length; x++) {
+        initialSettings[clsElements[x].id] = clsElements[x].value;
+    }
+
+    // Save checkboxes and radio buttons
+    clsElements = document.querySelectorAll(".form-check-input:not(.fileManagerCheck), .form-radio");
+    for (let x = 0; x < clsElements.length; x++) {
+        // Store boolean values for easy comparison
+        initialSettings[clsElements[x].id] = clsElements[x].checked.toString();
+    }
+
+    // Save corrections priorities
+    for (let x = 0; x < numCorrectionsSources; x++) {
+        initialSettings["correctionsPriority_" + correctionsSourceNames[x]] = correctionsSourcePriorities[x].toString();
+    }
+
+    // Note: recordsECEF and recordsGeodetic change very little so instead
+    // of creating copy here, we will resend any entered coordinates every time.
+}
+
 function hide(id) {
     ge(id).style.display = "none";
 }
@@ -738,39 +773,62 @@ function isElementShown(id) {
     return (false);
 }
 
-//Create CSV of all setting data
+//Create CSV of all setting data that has changed from the original given to us
 function sendData() {
     var settingCSV = "";
+    var changedCount = 0;
 
-    //Input boxes
+    // Check input boxes and dropdowns
     var clsElements = document.querySelectorAll(".form-control, .form-dropdown");
     for (let x = 0; x < clsElements.length; x++) {
-        settingCSV += clsElements[x].id + "," + clsElements[x].value + ",";
+        var id = clsElements[x].id;
+        var currentValue = clsElements[x].value;
+        if (initialSettings[id] !== currentValue) {
+            settingCSV += id + "," + currentValue + ",";
+            changedCount++;
+        }
     }
 
-    //Check boxes, radio buttons
-    //Remove file manager files
+    // Check boxes, radio buttons
     clsElements = document.querySelectorAll(".form-check-input:not(.fileManagerCheck), .form-radio");
     for (let x = 0; x < clsElements.length; x++) {
-        settingCSV += clsElements[x].id + "," + clsElements[x].checked + ",";
+        var id = clsElements[x].id;
+        // Store boolean as string 'true'/'false' for consistent comparison with initialSettings
+        var currentValue = clsElements[x].checked.toString();
+        if (initialSettings[id] !== currentValue) {
+            settingCSV += id + "," + currentValue + ",";
+            changedCount++;
+        }
     }
 
+    // Records (ECEF and Geodetic) - For simplicity, we send the full list if any list element exists.
     for (let x = 0; x < recordsECEF.length; x++) {
         settingCSV += "stationECEF" + x + ',' + recordsECEF[x] + ",";
     }
-
     for (let x = 0; x < recordsGeodetic.length; x++) {
         settingCSV += "stationGeodetic" + x + ',' + recordsGeodetic[x] + ",";
     }
 
+    // Corrections Priorities
     for (let x = 0; x < correctionsSourceNames.length; x++) {
-        settingCSV += "correctionsPriority_" + correctionsSourceNames[x] + ',' + correctionsSourcePriorities[x] + ",";
+        var id = "correctionsPriority_" + correctionsSourceNames[x];
+        var currentValue = correctionsSourcePriorities[x].toString();
+        if (initialSettings[id] !== currentValue) {
+            settingCSV += id + ',' + currentValue + ",";
+            changedCount++;
+        }
     }
 
-    console.log("Sending: " + settingCSV);
-    websocket.send(settingCSV);
+    console.log("Sending " + changedCount + " changed settings: " + settingCSV);
 
-    sendDataTimeout = setTimeout(sendData, 2000);
+    // Only send if there are changes (plus the always-sent records)
+    if (settingCSV.length > 0) {
+        websocket.send(settingCSV);
+        sendDataTimeout = setTimeout(sendData, 2000);
+    } else {
+        // If nothing changed, immediately report success.
+        showSuccess('saveBtn', "No changes detected.");
+    }
 }
 
 function showError(id, errorText) {
@@ -876,7 +934,7 @@ function validateFields() {
     if (isElementShown("lg290pGnssSettings") == true) {
         checkElementValue("rtcmMinElev", -90, 90, "Must be between -90 and 90", "collapseGNSSConfig");
     }
-    if (ge("enableGalileoHas").checked == true) {
+    if (isElementShown("configurePppSetting") == true) {
         checkElementStringSpacesNoCommas("configurePPP", 1, 30, "Must be 1 to 30 characters. Separated by spaces. Commas not allowed", "collapseGNSSConfig");
     }
     if (ge("enableNtripClient").checked == true) {
@@ -2006,6 +2064,20 @@ document.addEventListener("DOMContentLoaded", (event) => {
         adjustHAE();
     });
 
+    ge("enableGalileoHas").addEventListener("change", function () {
+        if ((isElementShown("galileoHasSetting") == true) && (isElementShown("lg290pGnssSettings") == true)) {
+            if (ge("enableGalileoHas").checked == true) {
+                show("configurePppSetting");
+            }
+            else {
+                hide("configurePppSetting");
+            }
+        }
+        else {
+            hide("configurePppSetting"); // Hide on Torch UM980 - i.e. non-LG290P
+        }
+    });
+
     for (let y = 0; y < numCorrectionsSources; y++) {
         var buttonName = "corrPrioButton" + y;
         ge(buttonName).addEventListener("click", function () {

Firmware/RTK_Everywhere/Begin.ino

@@ -657,7 +657,7 @@ void beginBoard()
         present.invertedFastPowerOff = true;
         present.gnss_to_uart = true;
         present.gnss_to_uart2 = true;
-        present.mosaicMicroSd;
+        present.mosaicMicroSd = true;
         present.microSdCardDetectLow = true; // Except microSD is connected to mosaic... present.microSd is false
 
         present.minCno = true;

Firmware/RTK_Everywhere/Display.ino

@@ -2813,11 +2813,12 @@ void displayMessage(const char *message, uint16_t displayTime)
         // Count words based on spaces
         uint8_t wordCount = 0;
         strncpy(temp, message, sizeof(temp) - 1); // strtok modifies the message so make copy
-        char *token = strtok(temp, " ");
+        char *preservedPointer;
+        char *token = strtok_r(temp, " ", &preservedPointer);
         while (token != nullptr)
         {
             wordCount++;
-            token = strtok(nullptr, " ");
+            token = strtok_r(nullptr, " ", &preservedPointer);
         }
 
         uint8_t yPos = (oled->getHeight() / 2) - (fontHeight / 2);
@@ -2829,11 +2830,11 @@ void displayMessage(const char *message, uint16_t displayTime)
         // drawFrame();
 
         strncpy(temp, message, sizeof(temp) - 1);
-        token = strtok(temp, " ");
+        token = strtok_r(temp, " ", &preservedPointer);
         while (token != nullptr)
         {
             printTextCenter(token, yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
-            token = strtok(nullptr, " ");
+            token = strtok_r(nullptr, " ", &preservedPointer);
             yPos += fontHeight;
         }
 

Firmware/RTK_Everywhere/GNSS.ino

@@ -442,7 +442,10 @@ bool gnssCmdUpdateConstellations(int commandIndex)
     if (gnss == nullptr)
         return false;
 
-    return gnss->setConstellations();
+    //return gnss->setConstellations();
+    // setConstellations() can take multiple seconds. Avoid calling during WebConfig
+    // as this can lead to >10 seconds required for parsing of the incoming settings blob
+    return true;
 }
 
 //----------------------------------------
@@ -453,7 +456,8 @@ bool gnssCmdUpdateMessageRates(int commandIndex)
     if (gnss == nullptr)
         return false;
 
-    return gnss->setMessages(MAX_SET_MESSAGES_RETRIES);
+    //return gnss->setMessages(MAX_SET_MESSAGES_RETRIES);
+    return true;
 }
 
 //----------------------------------------

Firmware/RTK_Everywhere/GNSS_UM980.ino

@@ -69,10 +69,6 @@ void GNSS_UM980::begin()
     // Instantiate the library
     _um980 = new UM980();
 
-    // Turn on/off debug messages
-    if (settings.debugGnss)
-        debuggingEnable();
-
     // In order to reduce UM980 configuration time, the UM980 library blocks the start of BESTNAV and RECTIME until 3D
     // fix is achieved However, if all NMEA messages are disabled, the UM980 will never detect a 3D fix.
     if (isGgaActive())
@@ -97,8 +93,14 @@ void GNSS_UM980::begin()
             return;
         }
     }
+
+    online.gnss = true;
+
     systemPrintln("GNSS UM980 online");
 
+    if (settings.debugGnss)
+        debuggingEnable(); // Print all debug to Serial
+
     // Check firmware version and print info
     printModuleInfo();
 
@@ -119,8 +121,6 @@ void GNSS_UM980::begin()
         gnssFirmwareVersionInt = 99;
 
     snprintf(gnssUniqueId, sizeof(gnssUniqueId), "%s", _um980->getID());
-
-    online.gnss = true;
 }
 
 //----------------------------------------
@@ -475,8 +475,10 @@ void GNSS_UM980::disableAllOutput()
         response &= _um980->disableOutputPort("COM2");
         response &= _um980->disableOutputPort("COM3");
         if (response)
-            break;
+            return;
     }
+
+    systemPrintln("UM980 failed to disable output");
 }
 
 //----------------------------------------

Firmware/RTK_Everywhere/LoRa.ino

@@ -542,7 +542,7 @@ void beginLoraFirmwareUpdate()
     else
         systemPrintln("ERROR: productVariant does not support LoRa");
 
-    // Make sure ESP32 is connected to LoRa STM32 UART
+    // Make sure ESP-UART1 is connected to LoRa STM32 UART0
     muxSelectLoRaConfigure();
 
     loraEnterBootloader(); // Push boot pin high and reset STM32
@@ -715,7 +715,7 @@ bool loraEnterCommandMode()
 
     systemFlush(); // Complete prints
 
-    muxSelectLoRaConfigure(); // Connect to the STM32 for configuration
+    muxSelectLoRaCommunication(); // Connect the LoRa radio to ESP32 UART0 (shared with USB)
 
     delay(50); // Wait for incoming serial to complete
     while (Serial.available())

Firmware/RTK_Everywhere/NVM.ino

@@ -990,8 +990,16 @@ bool parseLine(char *str)
 {
     char *ptr;
 
+    // A health warning about strtok:
+    // strtok will convert any delimiters it finds ("=" in our case) into NULL characters.
+    // Also, be very careful that you do not use strtok within an strtok while loop.
+    // The next call of strtok(NULL, ...) in the outer loop will use the pointer saved from the inner loop!
+    // The same is true for tasks!
+    // The solution is to use strtok_r - the reentrant version of strtok
+
     // Set strtok start of line.
-    str = strtok(str, "=");
+    char *preservedPointer;
+    str = strtok_r(str, "=", &preservedPointer);
     if (!str)
     {
         log_d("Fail");
@@ -1006,7 +1014,7 @@ bool parseLine(char *str)
     char settingString[100] = "";
 
     // Move pointer to end of line
-    str = strtok(nullptr, "\n");
+    str = strtok_r(nullptr, "\n", &preservedPointer);
     if (!str)
     {
         // This line does not contain a \n or the settingString is zero length

Firmware/RTK_Everywhere/Network.ino

@@ -262,10 +262,11 @@ void menuTcpUdp()
             // Remove any http:// or https:// prefix from host name
             // strtok modifies string to be parsed so we create a copy
             strncpy(hostname, settings.tcpClientHost, sizeof(hostname) - 1);
-            char *token = strtok(hostname, "//");
+            char *preservedPointer;
+            char *token = strtok_r(hostname, "//", &preservedPointer);
             if (token != nullptr)
             {
-                token = strtok(nullptr, "//"); // Advance to data after //
+                token = strtok_r(nullptr, "//", &preservedPointer); // Advance to data after //
                 if (token != nullptr)
                     strcpy(settings.tcpClientHost, token);
             }

Firmware/RTK_Everywhere/NtripClient.ino

@@ -216,10 +216,11 @@ bool ntripClientConnect()
     char hostname[51];
     strncpy(hostname, settings.ntripClient_CasterHost,
             sizeof(hostname) - 1); // strtok modifies string to be parsed so we create a copy
-    char *token = strtok(hostname, "//");
+    char *preservedPointer;
+    char *token = strtok_r(hostname, "//", &preservedPointer);
     if (token != nullptr)
     {
-        token = strtok(nullptr, "//"); // Advance to data after //
+        token = strtok_r(nullptr, "//", &preservedPointer); // Advance to data after //
         if (token != nullptr)
             strcpy(settings.ntripClient_CasterHost, token);
     }