Make compile guards work

Author: nseidle

Firmware/RTK_Everywhere/GNSS_ZED.ino

@@ -7,7 +7,11 @@ GNSS_ZED.ino
 #ifdef COMPILE_ZED
 
 extern int NTRIPCLIENT_MS_BETWEEN_GGA;
+
+#ifdef COMPILE_NETWORK
 extern NetworkClient *ntripClient;
+#endif // COMPILE_NETWORK
+
 extern unsigned long lastGGAPush;
 
 //----------------------------------------

Firmware/RTK_Everywhere/WiFi.ino

@@ -19,6 +19,8 @@
 
 int wifiConnectionAttempts; // Count the number of connection attempts between restarts
 
+bool restartWiFi = false; // Restart WiFi if user changes anything
+
 #ifdef COMPILE_WIFI
 
 //----------------------------------------
@@ -51,8 +53,6 @@ static DNSServer dnsServer;
 
 static bool wifiRunning;
 
-bool restartWiFi = false; // Restart WiFi if user changes anything
-
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // WiFi Routines
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -421,8 +421,15 @@ int wifiNetworkCount()
 //----------------------------------------
 void wifiRestart()
 {
-    wifiStop();
-    wifiStart();
+    // Restart the AP webserver if we are in that state
+    if (systemState == STATE_WIFI_CONFIG)
+        requestChangeState(STATE_WIFI_CONFIG_NOT_STARTED);
+    else
+    {
+        // Restart WiFi if we are not in AP config mode
+        WIFI_STOP();
+        wifiStart();
+    }
 }
 
 //----------------------------------------

Firmware/RTK_Everywhere/menuMain.ino

@@ -342,15 +342,7 @@ void menuMain()
     {
         restartWiFi = false;
 
-        // Restart the AP webserver if we are in that state
-        if (systemState == STATE_WIFI_CONFIG)
-            requestChangeState(STATE_WIFI_CONFIG_NOT_STARTED);
-        else
-        {
-            // Restart WiFi if we are not in AP config mode
-            WIFI_STOP();
-            wifiStart();
-        }
+        wifiRestart();
     }
 
     clearBuffer();           // Empty buffer of any newline chars