Merge pull request #784 from LeeLeahy2/no-udp-server

Build with COMPILE_UDP_SERVER commented out

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -27,12 +27,12 @@ void ntpServerStop() {}
 
 #endif // COMPILE_ETHERNET
 
-#ifndef COMPILE_NETWORK
-
 //----------------------------------------
 // Network layer
 //----------------------------------------
 
+#ifndef COMPILE_NETWORK
+
 void menuTcpUdp() {systemPrint("**Network not compiled**");}
 void networkBegin() {}
 void networkConsumerAdd(NETCONSUMER_t consumer, NetIndex_t network, const char * fileName, uint32_t lineNumber) {}
@@ -62,16 +62,6 @@ void networkUserRemove(NETCONSUMER_t consumer, const char * fileName, uint32_t l
 void networkValidateIndex(NetIndex_t index) {}
 void networkVerifyTables() {}
 
-//----------------------------------------
-// UDP server
-//----------------------------------------
-
-void udpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
-int32_t udpServerSendData(uint16_t dataHead) {return 0;}
-void udpServerStop() {}
-void udpServerUpdate() {}
-void udpServerZeroTail() {}
-
 #endif // COMPILE_NETWORK
 
 //----------------------------------------
@@ -166,6 +156,18 @@ void tcpServerValidateTables() {}
 void tcpServerZeroTail() {}
 #endif  // COMPILE_TCP_SERVER
 
+//----------------------------------------
+// UDP server
+//----------------------------------------
+
+#ifndef COMPILE_UDP_SERVER
+void udpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+int32_t udpServerSendData(uint16_t dataHead) {return 0;}
+void udpServerStop() {}
+void udpServerUpdate() {}
+void udpServerZeroTail() {}
+#endif  // COMPILE_UDP_SERVER
+
 //----------------------------------------
 // Web Server
 //----------------------------------------

Firmware/RTK_Everywhere/RTK_Everywhere.ino

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

Firmware/RTK_Everywhere/UdpServer.ino

@@ -59,7 +59,7 @@ UdpServer.ino
         3. Verify that the displayed coordinates, fix tpe etc. are valid
 */
 
-#ifdef COMPILE_NETWORK
+#ifdef COMPILE_UDP_SERVER
 
 //----------------------------------------
 // Constants
@@ -436,4 +436,4 @@ void udpServerZeroTail()
     udpServerTail = 0;
 }
 
-#endif // COMPILE_NETWORK
+#endif // COMPILE_UDP_SERVER