Merge pull request #688 from sparkfun/PostcardSurveyBaseFail

Fix Survey in for LG290P v<=3.0

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -154,7 +154,6 @@ void mqttClientValidateTables() {}
 void httpClientPrintStatus() {}
 void httpClientUpdate() {}
 void httpClientValidateTables() {}
-bool pointPerfectServiceUsesKeys() {return(false);}
 
 #endif   // COMPILE_HTTP_CLIENT
 
@@ -175,6 +174,7 @@ void stopWebServer() {}
 void webServerStop() {}
 void webServerUpdate()  {}
 void webServerVerifyTables() {}
+void wifiSettingsClone() {}
 
 #endif  // COMPILE_AP
 

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -389,11 +389,17 @@ bool GNSS_LG290P::configureBase()
         return (false);
     }
 
-    if (settings.gnssConfiguredBase)
+    // If the device is set to Survey-In, we must allow the device to be configured.
+    // Otherwise PQMTEPE (estimated position error) is never populated, so the survey
+    // never starts (Waiting for Horz Accuracy < 2.00m...)
+    if (settings.fixedBase == false) //Not a fixed base = Survey-in
     {
-        if (settings.debugGnss)
-            systemPrintln("Skipping LG290P Base configuration");
-        return true;
+        if (settings.gnssConfiguredBase)
+        {
+            if (settings.debugGnss)
+                systemPrintln("Skipping LG290P Base configuration");
+            return true;
+        }
     }
 
     bool response = true;
@@ -630,12 +636,10 @@ bool GNSS_LG290P::enableNMEA()
                 if (lg290pFirmwareVersion >= 4)
                     // Enable this message, at this rate, on this port
                     response &=
-                        _lg290p->setMessageRateOnPort(lgMessagesNMEA[messageNumber].msgTextName,
-                                                      msgRate, portNumber);
+                        _lg290p->setMessageRateOnPort(lgMessagesNMEA[messageNumber].msgTextName, msgRate, portNumber);
                 else
                     // Enable this message, at this rate
-                    response &= _lg290p->setMessageRate(lgMessagesNMEA[messageNumber].msgTextName,
-                                                        msgRate);
+                    response &= _lg290p->setMessageRate(lgMessagesNMEA[messageNumber].msgTextName, msgRate);
                 if (response == false && settings.debugGnss)
                     systemPrintf("Enable NMEA failed at messageNumber %d %s.\r\n", messageNumber,
                                  lgMessagesNMEA[messageNumber].msgTextName);
@@ -2015,7 +2019,7 @@ bool GNSS_LG290P::setElevation(uint8_t elevationDegrees)
 {
     // Present on >= v05
     if (lg290pFirmwareVersion >= 5)
-        return(_lg290p->setElevationAngle(elevationDegrees));
+        return (_lg290p->setElevationAngle(elevationDegrees));
 
     // Because we call this during module setup we rely on a positive result
     return true;
@@ -2049,7 +2053,7 @@ bool GNSS_LG290P::setMinCnoRadio(uint8_t cnoValue)
 {
     // Present on >= v05
     if (lg290pFirmwareVersion >= 5)
-        return(_lg290p->setCNR((float)cnoValue)); // 0.0 to 99.0
+        return (_lg290p->setCNR((float)cnoValue)); // 0.0 to 99.0
 
     // Because we call this during module setup we rely on a positive result
     return true;

Firmware/RTK_Everywhere/HTTP_Client.ino

@@ -10,6 +10,9 @@ HTTP_Client.ino
 
 ------------------------------------------------------------------------------*/
 
+ZtpResponse ztpResponse =
+    ZTP_NOT_STARTED; // Used in menuPP. This is the overall result of the ZTP process of testing multiple tokens
+
 #ifdef COMPILE_HTTP_CLIENT
 
 //----------------------------------------
@@ -46,9 +49,6 @@ const char *const httpClientStateName[] = {
 
 const int httpClientStateNameEntries = sizeof(httpClientStateName) / sizeof(httpClientStateName[0]);
 
-ZtpResponse ztpResponse =
-    ZTP_NOT_STARTED; // Used in menuPP. This is the overall result of the ZTP process of testing multiple tokens
-
 //----------------------------------------
 // Locals
 //----------------------------------------
@@ -527,10 +527,12 @@ void httpClientUpdate()
                     // If this is the first time this device has connected to ThingStream, they
                     // will not be present and we need to retry
                     // httpClientConnectLimitReached will prevent excessive retries
-                    if (((const char *)((*jsonZtp)["certificate"]) == nullptr) || ((const char *)((*jsonZtp)["privateKey"]) == nullptr))
+                    if (((const char *)((*jsonZtp)["certificate"]) == nullptr) ||
+                        ((const char *)((*jsonZtp)["privateKey"]) == nullptr))
                     {
                         systemPrintln("ERROR - certificate or privateKey not found!\r\n");
-                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device on plan
+                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device
+                                             // on plan
                         break;
                     }
 
@@ -561,8 +563,8 @@ void httpClientUpdate()
                         // Note: from the ZTP documentation:
                         // ["subscriptions"][0] will contain the key distribution topic
                         // But, assuming the key distribution topic is always ["subscriptions"][0] is potentially
-                        // brittle. It is safer to check the "description" contains "key distribution topic". If we are on
-                        // an IP-only plan, the path will be /pp/ubx/0236/ip If we are on a L-Band-only or L-Band+IP
+                        // brittle. It is safer to check the "description" contains "key distribution topic". If we are
+                        // on an IP-only plan, the path will be /pp/ubx/0236/ip If we are on a L-Band-only or L-Band+IP
                         // plan, the path will be /pp/ubx/0236/Lb These 0236 key distribution topics provide the keys in
                         // UBX format, ready to be pushed to a ZED. There are also /pp/key/ip and /pp/key/Lb topics
                         // which provide the keys in JSON format - but we don't use those.
@@ -634,7 +636,8 @@ void httpClientUpdate()
                     if ((const char *)((*jsonZtp)["rtcmCredentials"]["endpoint"]) == nullptr)
                     {
                         systemPrintln("ERROR - rtcmCredentials not found!\r\n");
-                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device on plan
+                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device
+                                             // on plan
                         break;
                     }
 

Firmware/RTK_Everywhere/support.ino

@@ -726,7 +726,7 @@ void verifyTables()
     correctionVerifyTables();
     webServerVerifyTables();
     pointPerfectVerifyTables();
-    wifi.verifyTables();
+    wifiVerifyTables();
 
     if (CORR_NUM >= (int)('x' - 'a'))
         reportFatalError("Too many correction sources");