Validate the bootProfileNumber in WiFi Config

Author: LeeLeahy2

Firmware/RTK_Surveyor/AP-Config/index.html

@@ -119,7 +119,7 @@ <h2>
                     </div>
 
                     <div class="form-group row mt-2">
-                        <span id="profileList" style="display:inline; margin-left:20px;"><Strong>Profiles</strong></span>
+                        <span id="activeProfiles" style="display:inline; margin-left:20px;"><Strong>Profiles</strong></span>
                     </div>
                     <div class="form-group row">
                         <span id="profile0Name" style="display:inline; margin-left:40px;">1: 12345678901234567890123456789012345678901234567890</span>

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

@@ -132,6 +132,7 @@ function parseIncoming(msg) {
     //Force element updates
     ge("profileNumber").dispatchEvent(new CustomEvent('change'));
     ge("profileName").dispatchEvent(new CustomEvent('change'));
+    ge("bootProfileNumber").dispatchEvent(new CustomEvent('change'));
     ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeSurveyIn").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeFixed").dispatchEvent(new CustomEvent('change'));
@@ -218,6 +219,7 @@ function validateFields() {
     //Profile Config
     checkElementValue("profileNumber", 1, 8, "Must be between 1 and 8", "collapseProfileConfig");
     checkElementString("profileName", 1, 49, "Must be 1 to 49 characters", "collapseProfileConfig");
+    checkBitMapValue("bootProfileNumber", 1, 8, "activeProfiles", "Must be an active profile between 1 and 8", "collapseProfileConfig");
 
     //GNSS Config
     checkElementValue("measurementRateHz", 0.00012, 10, "Must be between 0.00012 and 10Hz", "collapseGNSSConfig");
@@ -467,6 +469,19 @@ function checkConstellations() {
         clearError("ubxConstellations");
 }
 
+function checkBitMapValue(id, min, max, bitMap, errorText, collapseID) {
+    value = ge(id).value;
+    mask = ge(bitMap).value;
+    if ((value < min) || (value > max) || ((mask & (1 << value)) == 0)) {
+        ge(id + 'Error').innerHTML = 'Error: ' + errorText;
+        ge(collapseID).classList.add('show');
+        errorCount++;
+    }
+    else {
+        clearError(id);
+    }
+}
+
 function checkElementValue(id, min, max, errorText, collapseID) {
     value = ge(id).value;
     if (value < min || value > max) {

Firmware/RTK_Surveyor/Form.ino

@@ -523,6 +523,7 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
       || (bootProfileNumber < 1)
       || (bootProfileNumber > (MAX_PROFILE_COUNT + 1)))
       bootProfileNumber = 1;
+Serial.printf("bootProfileNumber: %d\r\n", bootProfileNumber);
   }
   else if (strcmp(settingName, "enableNtripServer") == 0)
     settings.enableNtripServer = settingValueBool;

Firmware/RTK_Surveyor/form.h

@@ -155,6 +155,7 @@ function parseIncoming(msg) {
     //Force element updates
     ge("profileNumber").dispatchEvent(new CustomEvent('change'));
     ge("profileName").dispatchEvent(new CustomEvent('change'));
+    ge("bootProfileNumber").dispatchEvent(new CustomEvent('change'));
     ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeSurveyIn").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeFixed").dispatchEvent(new CustomEvent('change'));
@@ -241,6 +242,7 @@ function validateFields() {
     //Profile Config
     checkElementValue("profileNumber", 1, 8, "Must be between 1 and 8", "collapseProfileConfig");
     checkElementString("profileName", 1, 49, "Must be 1 to 49 characters", "collapseProfileConfig");
+    checkBitMapValue("bootProfileNumber", 1, 8, "activeProfiles", "Must be an active profile between 1 and 8", "collapseProfileConfig");
 
     //GNSS Config
     checkElementValue("measurementRateHz", 0.00012, 10, "Must be between 0.00012 and 10Hz", "collapseGNSSConfig");
@@ -490,6 +492,19 @@ function checkConstellations() {
         clearError("ubxConstellations");
 }
 
+function checkBitMapValue(id, min, max, bitMap, errorText, collapseID) {
+    value = ge(id).value;
+    mask = ge(bitMap).value;
+    if ((value < min) || (value > max) || ((mask & (1 << value)) == 0)) {
+        ge(id + 'Error').innerHTML = 'Error: ' + errorText;
+        ge(collapseID).classList.add('show');
+        errorCount++;
+    }
+    else {
+        clearError(id);
+    }
+}
+
 function checkElementValue(id, min, max, errorText, collapseID) {
     value = ge(id).value;
     if (value < min || value > max) {
@@ -906,7 +921,7 @@ static const char *index_html = R"=====(
                     </div>
 
                     <div class="form-group row mt-2">
-                        <span id="profileList" style="display:inline; margin-left:20px;"><Strong>Profiles</strong></span>
+                        <span id="activeProfiles" style="display:inline; margin-left:20px;"><Strong>Profiles</strong></span>
                     </div>
                     <div class="form-group row">
                         <span id="profile0Name" style="display:inline; margin-left:40px;">1: 12345678901234567890123456789012345678901234567890</span>