Fix COMPILE_NETWORK

Compilation was failing if ethernet/wifi was disabled for compilation

Author: nseidle

.github/workflows/compile-rtk-everywhere.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: Get Known Libraries
         run: arduino-cli lib install
-          ArduinoJson@6.19.4
+          ArduinoJson@7.0.4
           [email protected]
           [email protected]
           "ESP32-OTA-Pull"@1.0.0

Firmware/RTK_Everywhere/Developer.ino

@@ -30,7 +30,7 @@ void ntpServerStop() {}
 
 #endif // COMPILE_ETHERNET
 
-#if !COMPILE_NETWORK
+#ifndef COMPILE_NETWORK
 
 //----------------------------------------
 // Network layer
@@ -42,6 +42,9 @@ void networkVerifyTables() {}
 void networkStop(uint8_t networkType) {}
 NETWORK_DATA * networkGetUserNetwork(NETWORK_USER user){return nullptr;}
 void networkUserClose(uint8_t user) {}
+uint8_t networkGetActiveType() {
+    return (0);
+}
 
 //----------------------------------------
 // NTRIP client

Firmware/RTK_Everywhere/Network.ino

@@ -137,7 +137,7 @@ Network.ino
     * private SNIP NTRIP caster
 ------------------------------------------------------------------------------*/
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants

Firmware/RTK_Everywhere/NtripClient.ino

@@ -117,7 +117,7 @@ NtripClient.ino
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants

Firmware/RTK_Everywhere/NtripServer.ino

@@ -127,7 +127,7 @@ NtripServer.ino
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -39,9 +39,7 @@
 #define COMPILE_BQ40Z50              // Comment out to remove BQ40Z50 functionality
 
 #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET)
-#define COMPILE_NETWORK true
-#else // COMPILE_WIFI || COMPILE_ETHERNET
-#define COMPILE_NETWORK false
+#define COMPILE_NETWORK
 #endif // COMPILE_WIFI || COMPILE_ETHERNET
 
 // 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
 */
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants

Firmware/RTK_Everywhere/UdpServer.ino

@@ -59,7 +59,7 @@ UdpServer.ino
         3. Verify that the displayed coordinates, fix tpe etc. are valid
 */
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants

Firmware/RTK_Everywhere/menuMain.ino

@@ -210,7 +210,7 @@ void menuMain()
             systemPrintln("6) **WiFi Not Compiled**");
 #endif // COMPILE_WIFI
 
-#if COMPILE_NETWORK
+#ifdef COMPILE_NETWORK
             systemPrintln("7) Configure TCP/UDP");
 #else  // COMPILE_NETWORK
             systemPrintln("7) **TCP/UDP Not Compiled**");