settings.configurePPP : use spaces not commas

Author: PaulZC

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -363,8 +363,12 @@
                             </span>
                         </div>
                         <div class="form-group row">
-                            <label for="configurePPP" class="box-margin20 col-sm-3 col-5 col-form-label">Configure
-                                PPP:</label>
+                            <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>

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

@@ -877,7 +877,7 @@ function validateFields() {
         checkElementValue("rtcmMinElev", -90, 90, "Must be between -90 and 90", "collapseGNSSConfig");
     }
     if (ge("enableGalileoHas").checked == true) {
-        checkElementString("configurePPP", 1, 30, "Must be 1 to 30 characters", "collapseGNSSConfig");
+        checkElementStringSpacesNoCommas("configurePPP", 1, 30, "Must be 1 to 30 characters. Separated by spaces. Commas not allowed", "collapseGNSSConfig");
     }
     if (ge("enableNtripClient").checked == true) {
         checkElementString("ntripClientCasterHost", 1, 45, "Must be 1 to 45 characters", "collapseGNSSConfig");
@@ -1381,6 +1381,19 @@ function checkElementString(id, min, max, errorText, collapseID) {
         clearError(id);
 }
 
+function checkElementStringSpacesNoCommas(id, min, max, errorText, collapseID) {
+    value = ge(id).value;
+    var commas = value.split(',');
+    var spaces = value.split(' ');
+    if ((value.length < min) || (value.length > max) || (commas.length > 1) || (spaces.length == 1)) {
+        ge(id + 'Error').innerHTML = 'Error: ' + errorText;
+        ge(collapseID).classList.add('show');
+        errorCount++;
+    }
+    else
+        clearError(id);
+}
+
 function checkElementIPAddress(id, errorText, collapseID) {
     value = ge(id).value;
     var data = value.split('.');

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -1933,7 +1933,28 @@ void GNSS_LG290P::menuConstellations()
         }
         else if ((incoming == MAX_LG290P_CONSTELLATIONS + 2) && present.galileoHasCapable && settings.enableGalileoHas)
         {
-            getUserInputString(settings.configurePPP, sizeof(settings.configurePPP));
+            systemPrintln("Enter the PPP configuration separated by spaces, not commas:");
+            char newConfig[sizeof(settings.configurePPP)];
+            getUserInputString(newConfig, sizeof(newConfig));
+            bool isValid = true;
+            int spacesSeen = 0;
+            for (size_t i = 0; i < strlen(newConfig); i++)
+            {
+                if ((isValid) && (newConfig[i] == ',')) // Check for no commas
+                {
+                    systemPrintln("Comma detected. Please try again");
+                    isValid = false;
+                }
+                if (newConfig[i] == ' ')
+                    spacesSeen++;
+            }
+            if ((isValid) && (spacesSeen < 4)) // Check for at least 4 spaces
+            {
+                systemPrintln("Configuration should contain at least 4 spaces");
+                isValid = false;
+            }
+            if (isValid)
+                snprintf(settings.configurePPP, sizeof(settings.configurePPP), "%s", newConfig);
         }
         else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
             break;
@@ -2437,7 +2458,7 @@ bool GNSS_LG290P::setHighAccuracyService(bool enableGalileoHas, const char *conf
         // $PQTMCFGPPP,W,2,1,120,0.10,0.15*68
         // Enable E6 HAS, WGS84, 120 timeout, 0.10m Horizontal convergence accuracy threshold, 0.15m Vertical threshold
         char paramConfigurePPP[sizeof(settings.configurePPP) + 4];
-        snprintf(paramConfigurePPP, sizeof(paramConfigurePPP), ",W,%s", configurePPP);
+        snprintf(paramConfigurePPP, sizeof(paramConfigurePPP), ",W,%s", configPppSpacesToCommas(configurePPP));
         if (_lg290p->sendOkCommand("$PQTMCFGPPP", paramConfigurePPP) == true)
         {
             systemPrintln("Galileo E6 HAS service enabled");

Firmware/RTK_Everywhere/settings.h

@@ -1111,7 +1111,7 @@ struct Settings
         254}; // Mark first record with key so defaults will be applied. Int value for each supported message - Report
               // rates for RTCM Base. Default to Quectel recommended rates.
     int lg290pMessageRatesPQTM[MAX_LG290P_PQTM_MSG] = {254}; // Mark first record with key so defaults will be applied.
-    char configurePPP[30] = "2,1,120,0.10,0.15"; // PQTMCFGPPP: 2,1,120,0.10,0.15
+    char configurePPP[30] = "2 1 120 0.10 0.15"; // PQTMCFGPPP: 2,1,120,0.10,0.15 ** Use spaces, not commas! **
 #endif // COMPILE_LG290P
 
     bool debugSettings = false;

Firmware/RTK_Everywhere/support.ino

@@ -1208,3 +1208,13 @@ void WeekToWToUnixEpoch(uint64_t *unixEpoch, uint16_t GPSWeek, uint32_t GPSToW)
     *unixEpoch += GPSToW;                          // 518400
     *unixEpoch += 315964800;
 }
+
+const char *configPppSpacesToCommas(const char *config)
+{
+    static char commas[sizeof(settings.configurePPP)];
+    snprintf(commas, sizeof(commas), "%s", config);
+    for (size_t i = 0; i < strlen(commas); i++)
+        if (commas[i] == ' ')
+            commas[i] = ',';
+    return (const char *)commas;
+}