Merge pull request #782 from LeeLeahy2/no-tcp-client

Build with COMPILE_TCP_CLIENT commented out

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -62,16 +62,6 @@ void networkUserRemove(NETCONSUMER_t consumer, const char * fileName, uint32_t l
 void networkValidateIndex(NetIndex_t index) {}
 void networkVerifyTables() {}
 
-//----------------------------------------
-// TCP client
-//----------------------------------------
-
-void tcpClientDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
-int32_t tcpClientSendData(uint16_t dataHead) {return 0;}
-void tcpClientUpdate() {}
-void tcpClientValidateTables() {}
-void tcpClientZeroTail() {}
-
 //----------------------------------------
 // TCP server
 //----------------------------------------
@@ -161,6 +151,18 @@ void ntripServerUpdate() {}
 void ntripServerValidateTables() {}
 #endif   // COMPILE_NTRIP_SERVER
 
+//----------------------------------------
+// TCP client
+//----------------------------------------
+
+#ifndef COMPILE_TCP_CLIENT
+void tcpClientDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+int32_t tcpClientSendData(uint16_t dataHead) {return 0;}
+void tcpClientUpdate() {}
+void tcpClientValidateTables() {}
+void tcpClientZeroTail() {}
+#endif  // COMPILE_TCP_CLIENT
+
 //----------------------------------------
 // Web Server
 //----------------------------------------

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -115,11 +115,12 @@
 
 #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET) || defined(COMPILE_CELLULAR)
 #define COMPILE_NETWORK
+#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_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
+#define COMPILE_TCP_CLIENT      // Comment out to remove TCP client functionality
 #endif                      // COMPILE_WIFI || COMPILE_ETHERNET || COMPILE_CELLULAR
 
 // Always define ENABLE_DEVELOPER to enable its use in conditional statements

Firmware/RTK_Everywhere/TcpClient.ino

@@ -115,7 +115,7 @@ TcpClient.ino
     * private SNIP NTRIP caster
 */
 
-#ifdef COMPILE_NETWORK
+#ifdef COMPILE_TCP_CLIENT
 
 //----------------------------------------
 // Constants
@@ -599,4 +599,4 @@ void tcpClientZeroTail()
     tcpClientTail = 0;
 }
 
-#endif // COMPILE_NETWORK
+#endif // COMPILE_TCP_CLIENT

Firmware/RTK_Everywhere/check.sh

@@ -87,6 +87,11 @@ sed -i 's|#define COMPILE_NTRIP_SERVER|//#define COMPILE_NTRIP_SERVER|' RTK_Ever
 make
 git reset --hard --quiet  HEAD
 
+# TCP Client
+sed -i 's|#define COMPILE_TCP_CLIENT|//#define COMPILE_TCP_CLIENT|' RTK_Everywhere.ino
+make
+git reset --hard --quiet  HEAD
+
 # UM980
 sed -i 's|#define COMPILE_UM980|//#define COMPILE_UM980|' RTK_Everywhere.ino
 make