Merge pull request #726 from sparkfun/release_candidate

Merge v3.10 changes
sparkfun · Oct 27, 2023 · f49cd3f · f49cd3f
2 parents 68a5806 + f1d009a
commit f49cd3f
Show file tree

Hide file tree

Showing 47 changed files with 6,174 additions and 2,555 deletions.
diff --git a/.github/workflows/compile-rtk-firmware.yml b/.github/workflows/compile-rtk-firmware.yml
@@ -6,7 +6,7 @@ on:
 env:
   FILENAME_PREFIX: RTK_Surveyor_Firmware
   FIRMWARE_VERSION_MAJOR: 3
-  FIRMWARE_VERSION_MINOR: 9
+  FIRMWARE_VERSION_MINOR: 10
   POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
 
 jobs:

diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,4 @@ NMEA_Client
 Read_Map_File
 RTK_Reset
 Split_Messages
+X.509_crt_bundle_bin_to_c
diff --git a/Firmware/RTKFirmware.csv b/Firmware/RTKFirmware.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x640000,
+app1,     app,  ota_1,   0x650000,0x640000,
+spiffs,   data, spiffs,  0xc90000,0x370000,
diff --git a/Firmware/RTK_Surveyor/AP-Config/index.html b/Firmware/RTK_Surveyor/AP-Config/index.html
@@ -1274,41 +1274,68 @@
                     </div>
 
                     <div class="form-check mt-3">
-                        <label class="form-check-label" for="enableTcpClient">TCP Client</label>
-                        <input class="form-check-input" type="checkbox" value="" id="enableTcpClient"
+                        <label class="form-check-label" for="enablePvtClient">TCP Client</label>
+                        <input class="form-check-input" type="checkbox" value="" id="enablePvtClient"
                             onClick="tcpBoxes()">
                         <span class="tt" data-bs-placement="right"
                             title="If enabled, device will connect to WiFi and push NMEA over the given TCP port.">
                             <span class="icon-info-circle text-primary ms-2"></span>
                         </span>
                     </div>
                     <div class="form-group row">
-                        <p id="enableTcpClientError" class="inlineError"></p>
+                        <p id="enablePvtClientError" class="inlineError"></p>
                     </div>
 
                     <div class="form-check mt-3">
-                        <label class="form-check-label" for="enableTcpServer">TCP Server</label>
-                        <input class="form-check-input" type="checkbox" value="" id="enableTcpServer"
+                        <label class="form-check-label" for="enablePvtServer">TCP Server</label>
+                        <input class="form-check-input" type="checkbox" value="" id="enablePvtServer"
                             onClick="tcpBoxes()">
                         <span class="tt" data-bs-placement="right"
                             title="If enabled, device will allow inbound TCP connections and push NMEA when a client is connected.">
                             <span class="icon-info-circle text-primary ms-2"></span>
                         </span>
                     </div>
                     <div class="form-group row">
-                        <p id="enableTcpServerError" class="inlineError"></p>
+                        <p id="enablePvtServerError" class="inlineError"></p>
                     </div>
 
                     <div id="tcpSettingsConfig">
                         <div class="form-group row">
-                            <label for="wifiTcpPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
+                            <label for="pvtServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
                                 <span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
                                     <span class="icon-info-circle text-primary ms-2"></span>
                                 </span>
                             </label>
                             <div class="col-sm-8 col-7">
-                                <input type="text" class="form-control" id="wifiTcpPort">
-                                <p id="wifiTcpPortError" class="inlineError"></p>
+                                <input type="text" class="form-control" id="pvtServerPort">
+                                <p id="pvtServerPortError" class="inlineError"></p>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-check mt-3">
+                        <label class="form-check-label" for="enablePvtUdpServer">UDP Server</label>
+                        <input class="form-check-input" type="checkbox" value="" id="enablePvtUdpServer"
+                            onClick="udpBoxes()">
+                        <span class="tt" data-bs-placement="right"
+                            title="If enabled, device will broadcast NMEA sentences over UPD">
+                            <span class="icon-info-circle text-primary ms-2"></span>
+                        </span>
+                    </div>
+                    <div class="form-group row">
+                        <p id="enablePvtUdpServerError" class="inlineError"></p>
+                    </div>
+
+                    <div id="udpSettingsConfig">
+                        <div class="form-group row">
+                            <label for="pvtUdpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
+                                <span class="tt" data-bs-placement="right" title="UDP port to use. Default: 10110">
+                                    <span class="icon-info-circle text-primary ms-2"></span>
+                                </span>
+                            </label>
+                            <div class="col-sm-8 col-7">
+                                <input type="text" class="form-control" id="pvtUdpServerPort">
+                                <p id="pvtUdpServerPortError" class="inlineError"></p>
                             </div>
                         </div>
                     </div>

diff --git a/Firmware/RTK_Surveyor/AP-Config/src/main.js b/Firmware/RTK_Surveyor/AP-Config/src/main.js
@@ -123,7 +123,7 @@ function parseIncoming(msg) {
 
                 ge("muxChannel2").innerHTML = "Wheel/Dir Encoder";
             }
-            else if (platformPrefix == "Facet L-Band") {
+            else if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
                 show("baseConfig");
                 hide("sensorConfig");
                 show("ppConfig");
@@ -353,6 +353,7 @@ function parseIncoming(msg) {
         updateECEFList();
         updateGeodeticList();
         tcpBoxes();
+        udpBoxes();
         tcpBoxesEthernet();
         dhcpEthernet();
         updateLatLong();
@@ -562,7 +563,7 @@ function validateFields() {
     }
 
     //PointPerfect Config
-    if (platformPrefix == "Facet L-Band") {
+    if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
         if (ge("enablePointPerfectCorrections").checked == true) {
             value = ge("pointPerfectDeviceProfileToken").value;
             if (value.length > 0)
@@ -592,10 +593,13 @@ function validateFields() {
     checkElementString("wifiNetwork2Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
     checkElementString("wifiNetwork3SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
     checkElementString("wifiNetwork3Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
-    if (ge("enableTcpClient").checked || ge("enableTcpServer").checked) {
-        checkElementString("wifiTcpPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
+    if (ge("enablePvtClient").checked || ge("enablePvtServer").checked) {
+        checkElementString("pvtServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
     }
-    checkCheckboxMutex("enableTcpClient", "enableTcpServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
+    if (ge("enablePvtUdpServer").checked) {
+        checkElementString("pvtUdpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
+    }
+    checkCheckboxMutex("enablePvtClient", "enablePvtServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
 
     //System Config
     if (ge("enableLogging").checked) {
@@ -1062,7 +1066,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
             if (platformPrefix == "Facet") {
                 ge("antennaReferencePoint").value = 61.4;
             }
-            else if (platformPrefix == "Facet L-Band") {
+            else if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
                 ge("antennaReferencePoint").value = 69.0;
             }
             else {
@@ -1567,12 +1571,22 @@ function abortHandler(event) {
 }
 
 function tcpBoxes() {
-    if (ge("enableTcpClient").checked || ge("enableTcpServer").checked) {
+    if (ge("enablePvtServer").checked || ge("enablePvtClient").checked) {
         show("tcpSettingsConfig");
     }
     else {
         hide("tcpSettingsConfig");
-        ge("wifiTcpPort").value = 2947;
+        ge("pvtServerPort").value = 2947;
+    }
+}
+
+function udpBoxes() {
+    if (ge("enablePvtUdpServer").checked) {
+        show("udpSettingsConfig");
+    }
+    else {
+        hide("udpSettingsConfig");
+        ge("pvtUdpServerPort").value = 10110;
     }
 }