Merge pull request #783 from LeeLeahy2/no-tcp-server

Build with COMPILE_TCP_SERVER 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() {}
 
-//----------------------------------------
-// TCP server
-//----------------------------------------
-
-void tcpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
-int32_t tcpServerSendData(uint16_t dataHead) {return 0;}
-void tcpServerZeroTail() {}
-void tcpServerValidateTables() {}
-
 //----------------------------------------
 // UDP server
 //----------------------------------------
@@ -163,6 +154,18 @@ void tcpClientValidateTables() {}
 void tcpClientZeroTail() {}
 #endif  // COMPILE_TCP_CLIENT
 
+//----------------------------------------
+// TCP server
+//----------------------------------------
+
+#ifndef COMPILE_TCP_SERVER
+void tcpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+int32_t tcpServerSendData(uint16_t dataHead) {return 0;}
+void tcpServerUpdate() {}
+void tcpServerValidateTables() {}
+void tcpServerZeroTail() {}
+#endif  // COMPILE_TCP_SERVER
+
 //----------------------------------------
 // Web Server
 //----------------------------------------

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -121,6 +121,7 @@
 #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_TCP_CLIENT      // Comment out to remove TCP client functionality
+#define COMPILE_TCP_SERVER      // Comment out to remove TCP server functionality
 #endif                      // COMPILE_WIFI || COMPILE_ETHERNET || COMPILE_CELLULAR
 
 // Always define ENABLE_DEVELOPER to enable its use in conditional statements

Firmware/RTK_Everywhere/TcpServer.ino

@@ -55,7 +55,7 @@ tcpServer.ino
            a new connection to the TCP server.
 */
 
-#ifdef COMPILE_NETWORK
+#ifdef COMPILE_TCP_SERVER
 
 //----------------------------------------
 // Constants
@@ -802,4 +802,4 @@ void tcpServerZeroTail()
         tcpServerClientTails[index] = 0;
 }
 
-#endif // COMPILE_NETWORK
+#endif // COMPILE_TCP_SERVER

Firmware/RTK_Everywhere/check.sh

@@ -92,6 +92,11 @@ sed -i 's|#define COMPILE_TCP_CLIENT|//#define COMPILE_TCP_CLIENT|' RTK_Everywhe
 make
 git reset --hard --quiet  HEAD
 
+# TCP Server
+sed -i 's|#define COMPILE_TCP_SERVER|//#define COMPILE_TCP_SERVER|' RTK_Everywhere.ino
+make
+git reset --hard --quiet  HEAD
+
 # UM980
 sed -i 's|#define COMPILE_UM980|//#define COMPILE_UM980|' RTK_Everywhere.ino
 make