Merge pull request #780 from LeeLeahy2/no-ntrip-server

Build with COMPILE_NTRIP_SERVER commented out

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -71,19 +71,6 @@ void ntripClientStop(bool clientAllocated) {online.ntripClient = false;}
 void ntripClientUpdate() {}
 void ntripClientValidateTables() {}
 
-//----------------------------------------
-// NTRIP server
-//----------------------------------------
-
-void ntripServerPrintStatus(int serverIndex) {systemPrintf("**NTRIP Server %d not compiled**\r\n", serverIndex);}
-void ntripServerProcessRTCM(int serverIndex, uint8_t incoming) {}
-void ntripServerStop(int serverIndex, bool shutdown) {online.ntripServer[serverIndex] = false;}
-void ntripServerUpdate() {}
-void ntripServerValidateTables() {}
-bool ntripServerIsCasting(int serverIndex) {
-    return (false);
-}
-
 //----------------------------------------
 // TCP client
 //----------------------------------------
@@ -131,6 +118,18 @@ void otaVerifyTables() {}
 
 #endif  // COMPILE_OTA_AUTO
 
+//----------------------------------------
+// HTTP Client
+//----------------------------------------
+
+#ifndef COMPILE_HTTP_CLIENT
+
+void httpClientPrintStatus() {}
+void httpClientUpdate() {}
+void httpClientValidateTables() {}
+
+#endif   // COMPILE_HTTP_CLIENT
+
 //----------------------------------------
 // MQTT Client
 //----------------------------------------
@@ -147,16 +146,17 @@ void mqttClientValidateTables() {}
 #endif   // COMPILE_MQTT_CLIENT
 
 //----------------------------------------
-// HTTP Client
+// NTRIP server
 //----------------------------------------
 
-#ifndef COMPILE_HTTP_CLIENT
-
-void httpClientPrintStatus() {}
-void httpClientUpdate() {}
-void httpClientValidateTables() {}
-
-#endif   // COMPILE_HTTP_CLIENT
+#ifndef COMPILE_NTRIP_SERVER
+bool ntripServerIsCasting(int serverIndex) {return false;}
+void ntripServerPrintStatus(int serverIndex) {systemPrintf("**NTRIP Server %d not compiled**\r\n", serverIndex);}
+void ntripServerProcessRTCM(int serverIndex, uint8_t incoming) {}
+void ntripServerStop(int serverIndex, bool shutdown) {online.ntripServer[serverIndex] = false;}
+void ntripServerUpdate() {}
+void ntripServerValidateTables() {}
+#endif   // COMPILE_NTRIP_SERVER
 
 //----------------------------------------
 // Web Server

Firmware/RTK_Everywhere/NtripServer.ino

@@ -122,7 +122,7 @@ NtripServer.ino
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#ifdef COMPILE_NETWORK
+#ifdef COMPILE_NTRIP_SERVER
 
 //----------------------------------------
 // Constants
@@ -877,4 +877,4 @@ void ntripServerValidateTables()
         reportFatalError("Fix ntripServerStateNameEntries to match NTRIPServerState");
 }
 
-#endif // COMPILE_NETWORK
+#endif  // COMPILE_NTRIP_SERVER

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -114,9 +114,10 @@
 
 #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_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
+#define COMPILE_MQTT_CLIENT     // Comment out to remove MQTT 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
 #endif                      // COMPILE_WIFI || COMPILE_ETHERNET || COMPILE_CELLULAR
 
 // Always define ENABLE_DEVELOPER to enable its use in conditional statements
@@ -1596,7 +1597,7 @@ bool logLengthExceeded() // Limit individual files to maxLogLength_minutes
 
     if (nextLogTime_ms == 0) // Keep logging if nextLogTime_ms has not been set
         return false;
-    
+
     // Note: this will roll over every 49.71 days...
     // Solution: https://stackoverflow.com/a/3097744 - see issue #742
     return (!((long)(nextLogTime_ms - millis()) > 0));

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 Server
+sed -i 's|#define COMPILE_NTRIP_SERVER|//#define COMPILE_NTRIP_SERVER|' RTK_Everywhere.ino
+make
+git reset --hard --quiet  HEAD
+
 # UM980
 sed -i 's|#define COMPILE_UM980|//#define COMPILE_UM980|' RTK_Everywhere.ino
 make