Merge branch 'Multiple_NTRIP' into ntrip-server

Author: PaulZC

Firmware/RTK_Surveyor/AP-Config/index.html

@@ -1091,6 +1091,19 @@
                         </span>
                     </div>
 
+                    <div id="geographicRegionDropdown">
+                        <label for="geographicRegion">Geographic Region:</label>
+                        <select name="geographicRegion" id="geographicRegion" class="form-dropdown mb-2">
+                            <option value="0">US</option>
+                            <option value="1">EU</option>
+                        </select>
+                        <span class="tt" data-bs-placement="right"
+                            title="Select your geographic region. This defines the default L-Band frequency. Default: US">
+                            <span class="icon-info-circle text-primary ms-2"></span>
+                        </span>
+                        <br>
+                    </div>
+
                     <div id="ppSettingsConfig">
                         <div class="form-check mt-3">
                             <label class="form-check-label" for="autoKeyRenewal">Auto Key Renewal </label>

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

@@ -1382,25 +1382,41 @@ function loadGeodetic() {
     var val = ge("StationCoordinatesGeodetic").value;
     if (val > "") {
         var parts = recordsGeodetic[val].split(' ');
-        ge("nicknameGeodetic").value = parts[0];
-        ge("fixedLatText").value = parts[1];
-        ge("fixedLongText").value = parts[2];
-        ge("antennaHeight").value = parts[4];
-        ge("antennaReferencePoint").value = parts[5];
+        var numParts = parts.length;
+        if (numParts >= 6) {
+            var latParts = (numParts - 4) / 2;
+            ge("nicknameGeodetic").value = parts[0];
+            ge("fixedLatText").value = parts[1];
+            if (latParts > 1) {
+                for (let moreParts = 1; moreParts < latParts; moreParts++) {
+                    ge("fixedLatText").value += ' ' + parts[moreParts + 1];
+                }
+            }
+            ge("fixedLongText").value = parts[1 + latParts];
+            if (latParts > 1) {
+                for (let moreParts = 1; moreParts < latParts; moreParts++) {
+                    ge("fixedLongText").value += ' ' + parts[moreParts + 1 + latParts];
+                }
+            }
+            ge("fixedAltitude").value = parts[numParts - 3];
+            ge("antennaHeight").value = parts[numParts - 2];
+            ge("antennaReferencePoint").value = parts[numParts - 1];
 
-        ge("fixedAltitude").value = parts[3];
+            $("input[name=markRadio][value=1]").prop('checked', false);
+            $("input[name=markRadio][value=2]").prop('checked', true);
 
-        $("input[name=markRadio][value=1]").prop('checked', false);
-        $("input[name=markRadio][value=2]").prop('checked', true);
+            adjustHAE();
 
-        adjustHAE();
-
-        clearError("nicknameGeodetic");
-        clearError("fixedLatText");
-        clearError("fixedLongText");
-        clearError("fixedAltitude");
-        clearError("antennaHeight");
-        clearError("antennaReferencePoint");
+            clearError("nicknameGeodetic");
+            clearError("fixedLatText");
+            clearError("fixedLongText");
+            clearError("fixedAltitude");
+            clearError("antennaHeight");
+            clearError("antennaReferencePoint");
+        }
+        else {
+            console.log("stationGeodetic split error");
+        }
     }
 }
 
@@ -1780,9 +1796,15 @@ function identifyInputType(userEntry) {
     if (dashCount > 3) return (CoordinateTypes.COORDINATE_INPUT_TYPE_INVALID_UNKNOWN); //Only 0, 1, 2, or 3 allowed. -105-11-05.1629 is valid.
     if (lengthOfLeadingNumber > 7) return (CoordinateTypes.COORDINATE_INPUT_TYPE_INVALID_UNKNOWN); //Only 7 or fewer. -1051105.188992 (DDDMMSS or DDMMSS) is valid
 
+    //console.log("userEntry: " + userEntry);
+    //console.log("decimalCount: " + decimalCount);
+    //console.log("spaceCount: " + spaceCount);
+    //console.log("dashCount: " + dashCount);
+    //console.log("lengthOfLeadingNumber: " + lengthOfLeadingNumber);
+
     var negativeSign = false;
     if (userEntry[0] == '-') {
-        userEntry = setCharAt(userEntry, 0, ''); //Remove leading space
+        userEntry = setCharAt(userEntry, 0, ''); //Remove leading minus
         negativeSign = true;
         dashCount--; //Use dashCount as the internal dashes only, not the leading negative sign
     }
@@ -1804,7 +1826,7 @@ function identifyInputType(userEntry) {
         seconds -= (decimal * 10000); //Remove DDD
         seconds -= (minutes * 100); //Remove MM
         convertedCoordinate = decimal + (minutes / 60.0) + (seconds / 3600.0);
-        if (convertedCoordinate) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1;
     }
     else if (spaceCount == 0 && dashCount == 0 && (lengthOfLeadingNumber == 5 || lengthOfLeadingNumber == 4)) //DDMM.mmmmmmm
     {
@@ -1816,7 +1838,7 @@ function identifyInputType(userEntry) {
         var minutes = userEntry; //Get DDDMM.mmmmmmm
         minutes -= (decimal * 100); //Remove DDD
         convertedCoordinate = decimal + (minutes / 60.0);
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
 
     else if (dashCount == 1) //DD-MM.mmmmmmm
@@ -1827,7 +1849,7 @@ function identifyInputType(userEntry) {
         var decimal = Number(data[0]); //Get DD
         var minutes = Number(data[1]); //Get MM.mmmmmmm
         convertedCoordinate = decimal + (minutes / 60.0);
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
     else if (dashCount == 2) //DD-MM-SS.ssss
     {
@@ -1843,13 +1865,13 @@ function identifyInputType(userEntry) {
 
         var seconds = Number(data[2]); //Get SS.ssssss
         convertedCoordinate = decimal + (minutes / 60.0) + (seconds / 3600.0);
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
     else if (spaceCount == 0) //DD.ddddddddd
     {
         coordinateInputType = CoordinateTypes.COORDINATE_INPUT_TYPE_DD;
         convertedCoordinate = userEntry;
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
     else if (spaceCount == 1) //DD MM.mmmmmmm
     {
@@ -1859,7 +1881,7 @@ function identifyInputType(userEntry) {
         var decimal = Number(data[0]); //Get DD
         var minutes = Number(data[1]); //Get MM.mmmmmmm
         convertedCoordinate = decimal + (minutes / 60.0);
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
     else if (spaceCount == 2) //DD MM SS.ssssss
     {
@@ -1875,10 +1897,11 @@ function identifyInputType(userEntry) {
 
         var seconds = Number(data[2]); //Get SS.ssssss
         convertedCoordinate = decimal + (minutes / 60.0) + (seconds / 3600.0);
-        if (negativeSign) convertedCoordinate *= -1;
+        if (negativeSign) convertedCoordinate *= -1.0;
     }
 
-    //console.log("convertedCoordinate: " + convertedCoordinate.toFixed(9));
+    //console.log("convertedCoordinate: " + Number(convertedCoordinate).toFixed(9));
+    //console.log("Detected type: " + printableInputType(coordinateInputType));
     return (coordinateInputType);
 }
 
@@ -1983,6 +2006,9 @@ function printableInputType(coordinateInputType) {
         case (CoordinateTypes.COORDINATE_INPUT_TYPE_DD_MM_SS):
             return ("DD MM SS.ssssss");
             break;
+        case (CoordinateTypes.COORDINATE_INPUT_TYPE_DD_MM_SS_DASH):
+            return ("DD-MM-SS.ssssss");
+            break;
         case (CoordinateTypes.COORDINATE_INPUT_TYPE_DDMMSS_NO_DECIMAL):
             return ("DDMMSS");
             break;

Firmware/RTK_Surveyor/Begin.ino

@@ -283,6 +283,8 @@ void beginBoard()
         settings.enablePrintBatteryMessages = false; // No pesky battery messages
     }
 
+    displaySfeFlame();
+
     char versionString[21];
     getFirmwareVersion(versionString, sizeof(versionString), true);
     systemPrintf("SparkFun RTK %s %s\r\n", platformPrefix, versionString);
@@ -361,6 +363,9 @@ void beginBoard()
 
 void beginSD()
 {
+    if(sdCardForcedOffline == true)
+        return;
+
     bool gotSemaphore;
 
     online.microSD = false;
@@ -445,6 +450,8 @@ void beginSD()
                     systemPrintln("SD init failed - using SPI and SdFat. Is card formatted?");
                     digitalWrite(pin_microSD_CS, HIGH); // Be sure SD is deselected
 
+                    sdCardForcedOffline = true; //Prevent future scans for SD cards
+
                     // Check reset count and prevent rolling reboot
                     if (settings.resetCount < 5)
                     {

Firmware/RTK_Surveyor/Display.ino

@@ -116,11 +116,7 @@ void beginDisplay()
 
             systemPrintln("Display started");
 
-            // Display the SparkFun LOGO
             oled.erase();
-            displayBitmap(0, 0, logoSparkFun_Width, logoSparkFun_Height, logoSparkFun);
-            oled.display();
-            splashStart = millis();
             return;
         }
 
@@ -130,6 +126,18 @@ void beginDisplay()
     systemPrintln("Display not detected");
 }
 
+// Display the SparkFun logo
+void displaySfeFlame()
+{
+    if (online.display == true)
+    {
+        oled.erase();
+        displayBitmap(0, 0, logoSparkFun_Width, logoSparkFun_Height, logoSparkFun);
+        oled.display();
+        splashStart = millis();
+    }
+}
+
 // Avoid code repetition
 void displayBatteryVsEthernet()
 {
@@ -1891,17 +1899,17 @@ void displayNoWiFi(uint16_t displayTime)
 
 void displayNoSSIDs(uint16_t displayTime)
 {
-  displayMessage("No SSIDs", displayTime);
+    displayMessage("No SSIDs", displayTime);
 }
 
 void displayAccountExpired(uint16_t displayTime)
 {
-  displayMessage("Account Expired", displayTime);
+    displayMessage("Account Expired", displayTime);
 }
 
 void displayNotListed(uint16_t displayTime)
 {
-  displayMessage("Not Listed", displayTime);
+    displayMessage("Not Listed", displayTime);
 }
 
 void displayRoverStart(uint16_t displayTime)
@@ -2048,11 +2056,11 @@ void displayWiFiConfig()
         snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
     else
     {
-        if(WiFi.getMode() == WIFI_STA)
+        if (WiFi.getMode() == WIFI_STA)
             snprintf(mySSID, sizeof(mySSID), "%s", WiFi.SSID().c_str());
 
-        //If we failed to connect to a friendly WiFi, and then fell back to AP mode, still display RTK Config
-        else if(WiFi.getMode() == WIFI_AP)
+        // If we failed to connect to a friendly WiFi, and then fell back to AP mode, still display RTK Config
+        else if (WiFi.getMode() == WIFI_AP)
             snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
 
         else
@@ -2450,7 +2458,7 @@ void paintSystemTest()
                 else
                     oled.print("FAIL");
             } // End display 0
-        }     // End Facet L-Band testing
+        } // End Facet L-Band testing
     }
 }
 

Firmware/RTK_Surveyor/Form.ino

@@ -813,6 +813,7 @@ void createSettingsString(char *newSettings)
     stringRecord(newSettings, "pointPerfectDeviceProfileToken", settings.pointPerfectDeviceProfileToken);
     stringRecord(newSettings, "enablePointPerfectCorrections", settings.enablePointPerfectCorrections);
     stringRecord(newSettings, "autoKeyRenewal", settings.autoKeyRenewal);
+    stringRecord(newSettings, "geographicRegion", settings.geographicRegion);
 
     // External PPS/Triggers
     stringRecord(newSettings, "enableExternalPulse", settings.enableExternalPulse);
@@ -1172,6 +1173,7 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
     }
     else if (strcmp(settingName, "fixedLongText") == 0)
     {
+        // Lat defines the settings.coordinateInputType. Don't update it here
         double newCoordinate = 0.0;
         if (coordinateIdentifyInputType((char *)settingValueStr, &newCoordinate) ==
             COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)
@@ -1384,6 +1386,9 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
     else if (strcmp(settingName, "autoFirmwareCheckMinutes") == 0)
         settings.autoFirmwareCheckMinutes = settingValueBool;
 
+    else if (strcmp(settingName, "geographicRegion") == 0)
+        settings.geographicRegion = settingValue;
+
     // Unused variables - read to avoid errors
     else if (strcmp(settingName, "measurementRateSec") == 0)
     {

Firmware/RTK_Surveyor/NVM.ino

@@ -280,7 +280,6 @@ void recordSystemSettingsToFile(File *settingsFile)
     settingsFile->printf("%s=%d\r\n", "debugPpCertificate", settings.debugPpCertificate);
 
     settingsFile->printf("%s=%d\r\n", "updateZEDSettings", settings.updateZEDSettings);
-    settingsFile->printf("%s=%d\r\n", "LBandFreq", settings.LBandFreq);
     settingsFile->printf("%s=%d\r\n", "enableLogging", settings.enableLogging);
     settingsFile->printf("%s=%d\r\n", "enableARPLogging", settings.enableARPLogging);
     settingsFile->printf("%s=%d\r\n", "ARPLoggingInterval_s", settings.ARPLoggingInterval_s);
@@ -454,6 +453,8 @@ void recordSystemSettingsToFile(File *settingsFile)
     settingsFile->printf("%s=%d\r\n", "enableZedUsb", settings.enableZedUsb);
     settingsFile->printf("%s=%d\r\n", "debugWiFiConfig", settings.debugWiFiConfig);
 
+    settingsFile->printf("%s=%d\r\n", "geographicRegion", settings.geographicRegion);
+
     // Add new settings above <------------------------------------------------------------>
 }
 
@@ -1080,8 +1081,6 @@ bool parseLine(char *str, Settings *settings)
         if (settings->updateZEDSettings != d)
             settings->updateZEDSettings = true; // If there is a discrepancy, push ZED reconfig
     }
-    else if (strcmp(settingName, "LBandFreq") == 0)
-        settings->LBandFreq = d;
     else if (strcmp(settingName, "timeZoneHours") == 0)
         settings->timeZoneHours = d;
     else if (strcmp(settingName, "timeZoneMinutes") == 0)
@@ -1368,6 +1367,9 @@ bool parseLine(char *str, Settings *settings)
     else if (strcmp(settingName, "debugWiFiConfig") == 0)
         settings->debugWiFiConfig = d;
 
+    else if (strcmp(settingName, "geographicRegion") == 0)
+        settings->geographicRegion = d;
+
     // Add new settings above
     //<------------------------------------------------------------>
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -632,6 +632,7 @@ uint32_t lastRTCAttempt = 0;      // Wait 1000ms between checking GNSS for curre
 uint32_t lastRTCSync = 0;         // Time in millis when the RTC was last sync'd
 bool rtcSyncd = false;            // Set to true when the RTC has been sync'd via TP pulse
 uint32_t lastPrintPosition = 0;   // For periodic display of the position
+uint32_t lastPrintState = 0;      // For periodic display of the RTK state (solution)
 
 uint32_t lastBaseIconUpdate = 0;
 bool baseIconDisplayed = false;   // Toggles as lastBaseIconUpdate goes above 1000ms
@@ -721,6 +722,9 @@ unsigned long shutdownNoChargeTimer = 0;
 
 RtkMode_t rtkMode; // Mode of operation
 
+bool sdCardForcedOffline = false; //Goes true if a isPresent() test passes, but then sdFat fails to mount SD card.
+//See issue: https://github.com/sparkfun/SparkFun_RTK_Firmware/issues/758
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 #define DEAD_MAN_WALKING_ENABLED    0
@@ -1033,6 +1037,9 @@ void loop()
     DMW_c("printPosition");
     printPosition(); // Periodically print GNSS coordinates if enabled
 
+    DMW_c("printRTKState");
+    printRTKState(); // Periodically print RTK state (solution) if enabled
+
     // A small delay prevents panic if no other I2C or functions are called
     delay(10);
 }

Firmware/RTK_Surveyor/States.ino

@@ -27,7 +27,7 @@ void updateSystemState()
             }
         }
 
-        if (settings.enablePrintState && ((millis() - lastStateTime) > 15000))
+        if (settings.enablePrintStates && ((millis() - lastStateTime) > 15000))
         {
             changeState(systemState);
             lastStateTime = millis();