Throw error if PP service is selected that requires WiFi, but no WiFi networks

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1197,27 +1197,27 @@
                         <select name="pointPerfectService" id="pointPerfectService" class="form-dropdown mb-2">
                         </select>
                         <span class="tt" data-bs-placement="right"
-                            title="Select the PointPerfect service the device has been registered to. Default: Disabled">
+                            title="The device will attempt to use PointPerfect for corrections. The device must be registered through SparkFun. NTRIP/RTCM service requires WiFi. Default: Disabled">
                             <span class="icon-info-circle text-primary ms-2"></span>
                         </span>
-                        <br>
+                        <p id="pointPerfectServiceError" class="inlineError"></p>
                     </div>
 
-                    <div id="ppSettingsRtcmConfig">
+                    <div id="ppSettingsLBandNAConfig">
+                        <div>
+                            Days until keys expire: <p id="daysRemaining" style="display:inline;">No Keys</p>
+                        </div>
+
                         <div class="form-check mt-3">
-                            <label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
+                            <label class="form-check-label" for="requestKeyUpdate"
+                                id="pointPerfectKeyUpdateLabel">Request Key Update</label>
                             <input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
                             <span class="tt" data-bs-placement="right"
                                 title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
                                 <span class="icon-info-circle text-primary ms-2"></span>
                             </span>
                         </div>
-                    </div>
 
-                    <div id="ppSettingsLBandNAConfig">
-                        <div>
-                            Days until keys expire: <p id="daysRemaining" style="display:inline;">No Keys</p>
-                        </div>
                         <div id="geographicRegionDropdown">
                             <label for="geographicRegion">Geographic Region:</label>
                             <select name="geographicRegion" id="geographicRegion" class="form-dropdown mb-2">
@@ -1257,15 +1257,6 @@
                             </div>
                         </div>
 
-                        <div class="form-check mt-3">
-                            <label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
-                            <input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
-                            <span class="tt" data-bs-placement="right"
-                                title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
-                                <span class="icon-info-circle text-primary ms-2"></span>
-                            </span>
-                        </div>
-
                         <div id="useAssistNowCheckbox">
                             <div class="form-check mt-3">
                                 <label class="form-check-label" for="useAssistNow">AssistNow </label>

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

@@ -501,8 +501,7 @@ function parseIncoming(msg) {
                 correctionsSourcePriorities.push(correctionPriority);
             }
             else {
-                console.log("Too many corrections sources");
-                console.log(correctionsSourceNames.length);
+                console.log("Too many corrections sources: ", correctionsSourceNames.length);
             }
         }
         else if (id.includes("checkingNewFirmware")) {
@@ -922,15 +921,7 @@ function validateFields() {
     // }
 
     //PointPerfect Config
-    if (ge("pointPerfectService").value > 0) {
-        value = ge("pointPerfectDeviceProfileToken").value;
-        if (value.length > 0)
-            checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
-    }
-    else {
-        clearElement("pointPerfectDeviceProfileToken", "");
-        ge("autoKeyRenewal").checked = true;
-    }
+    checkPointPerfectService();
 
     //Port Config
     if (ge("enableExternalPulse").checked == true) {
@@ -1091,8 +1082,8 @@ function saveConfig() {
         clearSuccess('saveBtn');
     }
     else {
-        sendData();
         clearError('saveBtn');
+        sendData();
         showSuccess('saveBtn', "Saving...");
     }
 
@@ -1111,6 +1102,30 @@ function checkConstellations() {
         clearError("gnssConstellations");
 }
 
+function checkPointPerfectService() {
+    if (ge("pointPerfectService").value > 0) {
+        value = ge("pointPerfectDeviceProfileToken").value;
+        if (value.length > 0)
+            checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
+
+        if (networkCount() == 0) {
+            showError('pointPerfectService', "This PointPerfect service requires at least one WiFi network");
+            ge("collapsePPConfig").classList.add('show');
+            ge("collapseWiFiConfig").classList.add('show');
+            errorCount++;
+        }
+        else {
+            clearError("pointPerfectService");
+        }
+
+    }
+    else {
+        clearElement("pointPerfectDeviceProfileToken", "");
+        ge("autoKeyRenewal").checked = true;
+        clearError("pointPerfectService");
+    }
+}
+
 function checkBitMapValue(id, min, max, bitMap, errorText, collapseID) {
     value = ge(id).value;
     mask = ge(bitMap).value;
@@ -1682,16 +1697,13 @@ document.addEventListener("DOMContentLoaded", (event) => {
     });
 
     ge("pointPerfectService").addEventListener("change", function () {
-        if (ge("pointPerfectService").value == 1) {
+        if (ge("pointPerfectService").value == 1) { //Flex RTCM 
             hide("ppSettingsLBandNAConfig");
-            show("ppSettingsRtcmConfig");
         }
-        else if (ge("pointPerfectService").value == 2) {
-            hide("ppSettingsRtcmConfig");
+        else if (ge("pointPerfectService").value == 2) { //Flex L-Band NA
             show("ppSettingsLBandNAConfig");
         }
-        else { //"pointPerfectService").value == 0
-            hide("ppSettingsRtcmConfig");
+        else { //"pointPerfectService").value == 0 //Disabled
             hide("ppSettingsLBandNAConfig");
         }
     });