Merge branch 'release_candidate' into AddFlex

Author: PaulZC

.github/workflows/compile-rtk-everywhere.yml

@@ -89,14 +89,17 @@ jobs:
           "SparkFun u-blox GNSS v3"@3.1.8
           "SparkFun Qwiic OLED Arduino Library"@1.0.13
           [email protected]
-          "SparkFun Extensible Message Parser"@1.0.2
+          "SparkFun Extensible Message Parser"@1.0.4
           "SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0
           "ArduinoMqttClient"@0.1.8
           "SparkFun u-blox PointPerfect Library"@1.11.4
           "SparkFun IM19 IMU Arduino Library"@1.0.1
-          "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
+          "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.5
           "SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.8
           "SparkFun I2C Expander Arduino Library"@1.0.1
+          "SparkFun Apple Accessory Arduino Library"@1.0.1
+          "SparkFun Authentication Coprocessor Arduino Library"@1.0.0
+          "SparkFun Toolkit"@1.0.6
 
       - name: Patch libmbedtls
         run: |
@@ -111,6 +114,11 @@ jobs:
           cd Firmware/RTK_Everywhere/Patch/
           cp NetworkEvents.* /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/libraries/Network/src/
 
+      - name: Patch libbt
+        run: |
+          cd Firmware/RTK_Everywhere/Patch/
+          cp libbt.a /home/runner/.arduino15/packages/esp32/tools/esp32-arduino-libs/${{ env.ESP_IDF }}/esp32/lib/libbt.a
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:

.github/workflows/non-release-build.yml

@@ -88,14 +88,17 @@ jobs:
           "SparkFun u-blox GNSS v3"@3.1.8
           "SparkFun Qwiic OLED Arduino Library"@1.0.13
           [email protected]
-          "SparkFun Extensible Message Parser"@1.0.2
+          "SparkFun Extensible Message Parser"@1.0.4
           "SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0
           "ArduinoMqttClient"@0.1.8
           "SparkFun u-blox PointPerfect Library"@1.11.4
           "SparkFun IM19 IMU Arduino Library"@1.0.1
-          "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
-          "SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.7
+          "SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.5
+          "SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.8
           "SparkFun I2C Expander Arduino Library"@1.0.1
+          "SparkFun Apple Accessory Arduino Library"@1.0.1
+          "SparkFun Authentication Coprocessor Arduino Library"@1.0.0
+          "SparkFun Toolkit"@1.0.6
 
       - name: Patch libmbedtls
         run: |
@@ -110,6 +113,11 @@ jobs:
           cd Firmware/RTK_Everywhere/Patch/
           cp NetworkEvents.* /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/libraries/Network/src/
 
+      - name: Patch libbt
+        run: |
+          cd Firmware/RTK_Everywhere/Patch/
+          cp libbt.a /home/runner/.arduino15/packages/esp32/tools/esp32-arduino-libs/${{ env.ESP_IDF }}/esp32/lib/libbt.a
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -161,7 +169,7 @@ jobs:
           mv RTK_Everywhere.ino.bin ${{ env.ARTIFACT }}
 
       - name: Upload artifact directory to action - avoid double-zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT }}
           path: Firmware/RTK_Everywhere/build/esp32.esp32.esp32/${{ env.ARTIFACT }}

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -458,11 +458,11 @@
 
                             <div style="margin-bottom:5px;">
                                 <button type="button" id="nmeaDefaults" class="btn btn-primary"
-                                    onClick="resetToSurveyingDefaults()">Reset to Surveying Defaults</button>
+                                    onClick="resetToSurveyingDefaults()">Reset to Defaults</button>
                             </div>
                             <div style="margin-bottom:5px;">
                                 <button type="button" id="loggingDefaults" class="btn btn-primary"
-                                    onClick="resetToLoggingDefaults()">Reset to Logging Defaults</button>
+                                    onClick="resetToLoggingDefaults()">Reset to PPP Logging</button>
                             </div>
                             <br>
                             <div id="mosaicNMEAStreamDropdowns">
@@ -1637,6 +1637,17 @@
                             <span class="icon-info-circle text-primary ms-2"></span>
                         </span>
                     </div>
+                    <div id="tcpWiFiTypeDropdown" class="mt-3">
+                        <label for="tcpOverWiFiStation">TCP Server Connection: </label>
+                        <select name="tcpWiFiType" id="tcpOverWiFiStation" class="form-dropdown">
+                            <option value="1">WiFi</option>
+                            <option value="0">AP</option>
+                        </select>
+                        <span class="tt" data-bs-placement="right"
+                            title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast TCP packets. In AP mode, the device will become an Access Point that devices can connect to over WiFi.">
+                            <span class="icon-info-circle text-primary ms-2"></span>
+                        </span>
+                    </div>
                 </div>
                 <div class="form-group row">
                     <p id="enableTcpServerError" class="inlineError"></p>
@@ -1661,24 +1672,22 @@
                             <input type="text" class="form-control" id="udpServerPort">
                             <p id="udpServerPortError" class="inlineError"></p>
                         </div>
+                        <div id="udpWiFiTypeDropdown" class="mt-auto">
+                            <label for="udpOverWiFiStation">UDP Server Connection: </label>
+                            <select name="udpWiFiType" id="udpOverWiFiStation" class="form-dropdown">
+                                <option value="1">WiFi</option>
+                                <option value="0">AP</option>
+                            </select>
+                            <span class="tt" data-bs-placement="right"
+                                title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast UDP packets. In AP mode, the device will become an Access Point that devices can connect to over WiFi.">
+                                <span class="icon-info-circle text-primary ms-2"></span>
+                            </span>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group row">
                     <p id="enableUdpServerError" class="inlineError"></p>
                 </div>
-
-                <div id="tcpUdpWiFiTypeDropdown" class="mt-3">
-                    <label for="tcpUdpOverWiFiStation">TCP/UDP Server Connection: </label>
-                    <select name="tcpUdpWiFiType" id="tcpUdpOverWiFiStation" class="form-dropdown">
-                        <option value="1">WiFi</option>
-                        <option value="0">AP</option>
-                    </select>
-                    <span class="tt" data-bs-placement="right"
-                        title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast TCP/UDP packets. In AP mode, the device will become an Access Point that devices can connect to over WiFi.">
-                        <span class="icon-info-circle text-primary ms-2"></span>
-                    </span>
-                </div>
-
             </div>
         </div>
 
@@ -2016,7 +2025,7 @@
                             <label for="maxLogTime" class="box-margin40 col-sm-3 col-7 col-form-label">Max Logging
                                 Time (min):
                                 <span class="tt" data-bs-placement="right"
-                                    title="Once the max log time is achieved, logging will cease. This is useful for limiting long term, overnight, static surveys to a certain length of time. Default: 1440 minutes. Limits: 1 to 2880 minutes.">
+                                    title="Once the max log time is achieved, logging will cease. This is useful for limiting long term, overnight, static surveys to a certain length of time. Default: 1440 minutes. Limits: 0 to 1,051,200 minutes. 0 = no limit.">
                                     <span class="icon-info-circle text-primary ms-2"></span>
                                 </span>
                             </label>
@@ -2027,15 +2036,23 @@
                         <div class="form-group row">
                             <label for="maxLogLength" class="box-margin40 col-sm-3 col-7 col-form-label">Max Log
                                 File Length (min):<span class="tt" data-bs-placement="right"
-                                    title="Once this length of time is achieved, a new log will be created. This is useful for creating multiple logs over a long survey. Default: 1440 minutes. Limits: 1 to 2880 minutes.">
+                                    title="Once this length of time is achieved, a new log will be created. This is useful for creating multiple logs over a long survey. Default: 1440 minutes. Limits: 0 to 2880 minutes. 0 = no limit.">
                                     <span class="icon-info-circle text-primary ms-2"></span>
                                 </span>
                             </label>
-
                             <input type="number" class="form-control box-small" id="maxLogLength">
                             <p id="maxLogLengthError" class="inlineError"></p>
                         </div>
 
+                        <div class="form-check mt-1 box-margin20">
+                            <label class="form-check-label" for="alignedLogFiles">Aligned Log Files</label>
+                            <input class="form-check-input" type="checkbox" value="" id="alignedLogFiles" unchecked>
+                            <span class="tt" data-bs-placement="right"
+                                title="If enabled, log files will be aligned to the Max Log File Length. Only possible if the Max Log Length is an integral fraction of 24 hours.">
+                                <span class="icon-info-circle text-primary ms-2"></span>
+                            </span>
+                        </div>
+
                         <div id="logFile" class="row">
                             <div class="mb-2">
                                 <label for="logFile" class="form-group box-margin20">Log file name: <span
@@ -2069,7 +2086,7 @@
                                 <label for="ARPLoggingInterval" class="box-margin40 col-sm-3 col-7 col-form-label">ARP
                                     Logging Interval (s):
                                     <span class="tt" data-bs-placement="right"
-                                        title="If ARP logging is enabled, the Antenna Reference Position will be logged at intervals of this many seconds.">
+                                        title="If ARP logging is enabled, the Antenna Reference Position will be logged at intervals of this many seconds. Min: 1. Max 600. Default: 10.">
                                         <span class="icon-info-circle text-primary ms-2"></span>
                                     </span>
                                 </label>

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

@@ -648,7 +648,6 @@ function parseIncoming(msg) {
         ge("enableARPLogging").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoFirmwareUpdate").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoReset").dispatchEvent(new CustomEvent('change'));
-        ge("useLocalizedDistribution").dispatchEvent(new CustomEvent('change'));
 
         updateECEFList();
         updateGeodeticList();
@@ -1004,8 +1003,8 @@ function validateFields() {
 
     //System Config
     if (ge("enableLogging").checked == true) {
-        checkElementValue("maxLogTime", 1, 1051200, "Must be 1 to 1,051,200", "collapseSystemConfig");
-        checkElementValue("maxLogLength", 1, 1051200, "Must be 1 to 1,051,200", "collapseSystemConfig");
+        checkElementValue("maxLogTime", 0, 1051200, "Must be 0 to 1,051,200", "collapseSystemConfig");
+        checkElementValue("maxLogLength", 0, 2880, "Must be 0 to 2880", "collapseSystemConfig");
     }
     else {
         clearElement("maxLogTime", 60 * 24);
@@ -1435,6 +1434,15 @@ function resetToSurveyingDefaults() {
 
         ge("messageIntervalRTCMRover_RTCM1033").value = 10.0;
     }
+    else if (platformPrefix == "Postcard") {
+        ge("messageRateNMEA_GPRMC").value = 1;
+        ge("messageRateNMEA_GPGGA").value = 1;
+        ge("messageRateNMEA_GPGSV").value = 1;
+        ge("messageRateNMEA_GPGSA").value = 1;
+        ge("messageRateNMEA_GPVTG").value = 1;
+        ge("messageRateNMEA_GPGLL").value = 1;
+        ge("messageRateNMEA_GPGST").value = 1; //Supported on >= v4
+    }
 }
 function resetToLoggingDefaults() {
     zeroMessages();
@@ -1449,16 +1457,40 @@ function resetToLoggingDefaults() {
         ge("ubxMessageRate_RXM_SFRBX").value = 1;
     }
     else if (platformPrefix == "Torch") {
-        ge("messageRateNMEA_GPGGA").value = 0.5;
-        ge("messageRateNMEA_GPGSA").value = 0.5;
-        ge("messageRateNMEA_GPGST").value = 0.5;
-        ge("messageRateNMEA_GPGSV").value = 1.0;
-        ge("messageRateNMEA_GPRMC").value = 0.5;
-
-        ge("messageRateRTCMRover_RTCM1019").value = 1.0;
-        ge("messageRateRTCMRover_RTCM1020").value = 1.0;
-        ge("messageRateRTCMRover_RTCM1042").value = 1.0;
-        ge("messageRateRTCMRover_RTCM1046").value = 1.0;
+        ge("messageRateNMEA_GPGGA").value = 1;
+        ge("messageRateNMEA_GPGSA").value = 1;
+        ge("messageRateNMEA_GPGST").value = 1;
+        ge("messageRateNMEA_GPGSV").value = 5; // Limit to 1 per 5 seconds
+        ge("messageRateNMEA_GPRMC").value = 1;
+
+        ge("messageRateRTCMRover_RTCM1019").value = 30;
+        ge("messageRateRTCMRover_RTCM1020").value = 30;
+        ge("messageRateRTCMRover_RTCM1042").value = 30;
+        ge("messageRateRTCMRover_RTCM1046").value = 30;
+
+        ge("messageRateRTCMRover_RTCM1074").value = 30;
+        ge("messageRateRTCMRover_RTCM1084").value = 30;
+        ge("messageRateRTCMRover_RTCM1094").value = 30;
+        ge("messageRateRTCMRover_RTCM1124").value = 30;
+    }
+    else if (platformPrefix == "Postcard") {
+        ge("messageRateNMEA_GPRMC").value = 1;
+        ge("messageRateNMEA_GPGGA").value = 1;
+        ge("messageRateNMEA_GPGSV").value = 1;
+        ge("messageRateNMEA_GPGSA").value = 1;
+        ge("messageRateNMEA_GPVTG").value = 1;
+        ge("messageRateNMEA_GPGLL").value = 1;
+        ge("messageRateNMEA_GPGST").value = 1; // Supported on >= v4
+
+        ge("messageRateRTCMRover_RTCM1019").value = 30;
+        ge("messageRateRTCMRover_RTCM1020").value = 30;
+        ge("messageRateRTCMRover_RTCM1042").value = 30;
+        ge("messageRateRTCMRover_RTCM1046").value = 30;
+
+        ge("messageRateRTCMRover_RTCM107X").value = 30;
+        ge("messageRateRTCMRover_RTCM108X").value = 30;
+        ge("messageRateRTCMRover_RTCM109X").value = 30;
+        ge("messageRateRTCMRover_RTCM112X").value = 30;
     }
     else if (platformPrefix == "Facet mosaicX5") {
         ge("streamIntervalNMEA_0").value = 6; //msec500
@@ -1743,15 +1775,6 @@ document.addEventListener("DOMContentLoaded", (event) => {
         }
     });
 
-    ge("useLocalizedDistribution").addEventListener("change", function () {
-        if (ge("useLocalizedDistribution").checked) {
-            show("localizedDistributionTileLevelDropdown");
-        }
-        else {
-            hide("localizedDistributionTileLevelDropdown");
-        }
-    });
-
     ge("enableExternalPulse").addEventListener("change", function () {
         if (ge("enableExternalPulse").checked == true) {
             show("externalPulseConfigDetails");