Merge pull request #781 from LeeLeahy2/no-ntrip-client

Build with COMPILE_NTRIP_CLIENT commented out

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -62,15 +62,6 @@ void networkUserRemove(NETCONSUMER_t consumer, const char * fileName, uint32_t l
 void networkValidateIndex(NetIndex_t index) {}
 void networkVerifyTables() {}
 
-//----------------------------------------
-// NTRIP client
-//----------------------------------------
-
-void ntripClientPrintStatus() {systemPrintln("**NTRIP Client not compiled**");}
-void ntripClientStop(bool clientAllocated) {online.ntripClient = false;}
-void ntripClientUpdate() {}
-void ntripClientValidateTables() {}
-
 //----------------------------------------
 // TCP client
 //----------------------------------------
@@ -145,6 +136,18 @@ void mqttClientValidateTables() {}
 
 #endif   // COMPILE_MQTT_CLIENT
 
+//----------------------------------------
+// NTRIP client
+//----------------------------------------
+
+#ifndef COMPILE_NTRIP_CLIENT
+void ntripClientPrintStatus() {systemPrintln("**NTRIP Client not compiled**");}
+void ntripClientPushGGA(const char * ggaString) {}
+void ntripClientStop(bool clientAllocated) {online.ntripClient = false;}
+void ntripClientUpdate() {}
+void ntripClientValidateTables() {}
+#endif   // COMPILE_NTRIP_CLIENT
+
 //----------------------------------------
 // NTRIP server
 //----------------------------------------

Firmware/RTK_Everywhere/GNSS.ino

@@ -4,14 +4,6 @@ GNSS.ino
   GNSS layer implementation
 ------------------------------------------------------------------------------*/
 
-extern int NTRIPCLIENT_MS_BETWEEN_GGA;
-
-#ifdef COMPILE_NETWORK
-extern NetworkClient *ntripClient;
-#endif // COMPILE_NETWORK
-
-extern unsigned long lastGGAPush;
-
 //----------------------------------------
 // Setup the general configuration of the GNSS
 // Not Rover or Base specific (ie, baud rates)
@@ -92,38 +84,20 @@ static void pushGPGGA(char *ggaData)
 
     if (xSemaphoreTake(reentrant, 10 / portTICK_PERIOD_MS) == pdPASS)
     {
-        if (ggaData)
-        {
-            snprintf(storedGPGGA, sizeof(storedGPGGA), "%s", ggaData);
-            xSemaphoreGive(reentrant);
-            return;
-        }
-
-#ifdef COMPILE_NETWORK
-        // Wait until the client has been created
-        if (ntripClient != nullptr)
+        do
         {
-            // Provide the caster with our current position as needed
-            if (ntripClient->connected() && settings.ntripClient_TransmitGGA == true)
+            // Save the ggaData string
+            if (ggaData)
             {
-                if ((millis() - lastGGAPush) > NTRIPCLIENT_MS_BETWEEN_GGA)
-                {
-                    lastGGAPush = millis();
-
-                    if ((settings.debugNtripClientRtcm || PERIODIC_DISPLAY(PD_NTRIP_CLIENT_GGA)) && !inMainMenu)
-                    {
-                        PERIODIC_CLEAR(PD_NTRIP_CLIENT_GGA);
-                        systemPrintf("NTRIP Client pushing GGA to server: %s", (const char *)storedGPGGA);
-                    }
-
-                    // Push our current GGA sentence to caster
-                    if (strlen(storedGPGGA) > 0)
-                        ntripClient->write((const uint8_t *)storedGPGGA, strlen(storedGPGGA));
-                }
+                snprintf(storedGPGGA, sizeof(storedGPGGA), "%s", ggaData);
+                break;
             }
-        }
-#endif // COMPILE_NETWORK
 
+            // Verify that a GGA string has been saved
+            if (storedGPGGA[0])
+                // Push our current GGA sentence to caster
+                ntripClientPushGGA(storedGPGGA);
+        } while (0);
         xSemaphoreGive(reentrant);
     }
 }

Firmware/RTK_Everywhere/NtripClient.ino

@@ -117,7 +117,7 @@ NtripClient.ino
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#ifdef COMPILE_NETWORK
+#ifdef COMPILE_NTRIP_CLIENT
 
 //----------------------------------------
 // Constants
@@ -494,6 +494,34 @@ void ntripClientPrintStatus()
     }
 }
 
+//----------------------------------------
+// Push GGA string to the NTRIP caster
+//----------------------------------------
+void ntripClientPushGGA(const char * ggaString)
+{
+    // Wait until the client has been created
+    if (ntripClient != nullptr)
+    {
+        // Provide the caster with our current position as needed
+        if (ntripClient->connected() && settings.ntripClient_TransmitGGA == true)
+        {
+            if ((millis() - lastGGAPush) > NTRIPCLIENT_MS_BETWEEN_GGA)
+            {
+                lastGGAPush = millis();
+
+                if ((settings.debugNtripClientRtcm || PERIODIC_DISPLAY(PD_NTRIP_CLIENT_GGA)) && !inMainMenu)
+                {
+                    PERIODIC_CLEAR(PD_NTRIP_CLIENT_GGA);
+                    systemPrintf("NTRIP Client pushing GGA to server: %s", ggaString);
+                }
+
+                // Push the current GGA sentence to caster
+                ntripClient->write((const uint8_t *)ggaString, strlen(ggaString));
+            }
+        }
+    }
+}
+
 //----------------------------------------
 // Determine if NTRIP client data is available
 //----------------------------------------
@@ -972,4 +1000,4 @@ void ntripClientValidateTables()
         reportFatalError("Fix ntripClientStateNameEntries to match NTRIPClientState");
 }
 
-#endif // COMPILE_NETWORK
+#endif  // COMPILE_NTRIP_CLIENT

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -116,6 +116,7 @@
 #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET) || defined(COMPILE_CELLULAR)
 #define COMPILE_NETWORK
 #define COMPILE_MQTT_CLIENT     // Comment out to remove MQTT Client functionality
+#define COMPILE_NTRIP_CLIENT    // Comment out to remove NTRIP client functionality
 #define COMPILE_NTRIP_SERVER    // Comment out to remove NTRIP server functionality
 #define COMPILE_OTA_AUTO        // Comment out to disable automatic over-the-air firmware update
 #define COMPILE_HTTP_CLIENT     // Comment out to disable HTTP Client (PointPerfect ZTP) functionality

Firmware/RTK_Everywhere/check.sh

@@ -77,6 +77,11 @@ sed -i 's|#define COMPILE_MOSAICX5|//#define COMPILE_MOSAICX5|' RTK_Everywhere.i
 make
 git reset --hard --quiet  HEAD
 
+# NTRIP Client
+sed -i 's|#define COMPILE_NTRIP_CLIENT|//#define COMPILE_NTRIP_CLIENT|' RTK_Everywhere.ino
+make
+git reset --hard --quiet  HEAD
+
 # NTRIP Server
 sed -i 's|#define COMPILE_NTRIP_SERVER|//#define COMPILE_NTRIP_SERVER|' RTK_Everywhere.ino
 make