Merge branch 'release_candidate' into nsUpdates

Author: nseidle

Firmware/Dockerfile

@@ -17,6 +17,9 @@ ARG DEBUG_LEVEL=error
 # Set to false for releases
 ARG ENABLE_DEVELOPER=true
 
+# arduino-cli warnings: none default more all
+ARG WARNINGS=default
+
 # If you have your own u-blox PointPerfect token(s), define them here
 # or pass in as args when building the Dockerfile
 # POINTPERFECT_LBAND_TOKEN is the token for the deprecated u-blox L-band SPARTN service
@@ -100,10 +103,6 @@ RUN cd ./RTK_Everywhere/Patch \
     && cp libmbedx509.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libmbedx509.a" \
     && cp libbt.a "/root/.arduino15/packages/esp32/tools/esp32-arduino-libs/${ESP_IDF}/esp32/lib/libbt.a"
 
-# Patch NetworkEvents
-RUN cd ./RTK_Everywhere/Patch \
-    && cp NetworkEvents.* "/root/.arduino15/packages/esp32/hardware/esp32/${CORE_VERSION}/libraries/Network/src/"
-
 # Update form.h with index_html and main_js
 RUN cd ./Tools \
     && python3 index_html_zipper.py ../RTK_Everywhere/AP-Config/index.html ../RTK_Everywhere/form.h \
@@ -116,6 +115,7 @@ RUN cp RTKEverywhere.csv "/root/.arduino15/packages/esp32/hardware/esp32/${CORE_
 # Compile Sketch
 RUN cd ./RTK_Everywhere \
     && arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${DEBUG_LEVEL},PSRAM=enabled \
+    --warnings ${WARNINGS} \
     ./RTK_Everywhere.ino \
     --build-property build.partitions=RTKEverywhere \
     --build-property upload.maximum_size=4055040 \

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

@@ -1477,24 +1477,8 @@ void beginCharger()
     {
         // Set pre-charge defaults for the MP2762A
         // See issue: https://github.com/sparkfun/SparkFun_RTK_Everywhere_Firmware/issues/240
-        if (mp2762Begin(i2c_0) == true)
-        {
-            // Resetting registers to defaults
-            mp2762registerReset();
-
-            // Setting FastCharge to 6.6V
-            mp2762setFastChargeVoltageMv(6600);
-
-            // Setting precharge current to 880mA
-            mp2762setPrechargeCurrentMa(880);
-
-            systemPrintln("Charger configuration complete");
-            online.batteryCharger_mp2762a = true;
-        }
-        else
-        {
+        if (mp2762Begin(i2c_0, 6600, 880) == false)
             systemPrintln("MP2762A charger failed to initialize");
-        }
     }
 }