Merge pull request #388 from LeeLeahy2/no-wifi-new

Compile successfully when comment out COMPILE_WIFI

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -153,6 +153,7 @@ void discardTcpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET n
 
 void menuWiFi() {systemPrintln("**WiFi not compiled**");}
 bool wifiConnect(unsigned long timeout) {return false;}
+bool wifiConnect(unsigned long timeout, bool useAPSTAMode, bool *wasInAPmode) {return false;}
 IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}
 IPAddress wifiGetIpAddress() {return IPAddress((uint32_t)0);}
 IPAddress wifiGetSubnetMask() {return IPAddress((uint32_t)0);}
@@ -162,6 +163,7 @@ bool wifiIsConnected() {return false;}
 bool wifiIsNeeded() {return false;}
 int wifiNetworkCount() {return 0;}
 void wifiPrintNetworkInfo() {}
+void wifiSetApMode() {}
 void wifiStart() {}
 void wifiStop() {}
 void wifiUpdate() {}

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -28,8 +28,6 @@
 #ifdef COMPILE_WIFI
 #define COMPILE_AP          // Requires WiFi. Comment out to remove Access Point functionality
 #define COMPILE_ESPNOW      // Requires WiFi. Comment out to remove ESP-Now functionality.
-#define COMPILE_MQTT_CLIENT // Requires WiFi. Comment out to remove MQTT Client functionality
-#define COMPILE_OTA_AUTO    // Requires WiFi. Comment out to disable automatic over-the-air firmware update
 #endif                      // COMPILE_WIFI
 
 #define COMPILE_L_BAND               // Comment out to remove L-Band functionality
@@ -40,6 +38,8 @@
 
 #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET)
 #define COMPILE_NETWORK
+#define COMPILE_MQTT_CLIENT // Requires WiFi. Comment out to remove MQTT Client functionality
+#define COMPILE_OTA_AUTO    // Requires WiFi. Comment out to disable automatic over-the-air firmware update
 #endif // COMPILE_WIFI || COMPILE_ETHERNET
 
 // Always define ENABLE_DEVELOPER to enable its use in conditional statements
@@ -67,21 +67,23 @@
 
 #define NTRIP_SERVER_MAX 4
 
+#ifdef  COMPILE_NETWORK
 #include <NetworkClient.h>
 #include <NetworkClientSecure.h>
 #include <NetworkUdp.h>
+#include <DNSServer.h>    //Built-in.
+#include "ESP32OTAPull.h" //http://librarymanager/All#ESP-OTA-Pull Used for getting new firmware from RTK Binaries repo
+#include <ESPmDNS.h>      //Built-in.
+#include <HTTPClient.h>   //Built-in. Needed for ThingStream API for ZTP
+#include <MqttClient.h>   //http://librarymanager/All#ArduinoMqttClient by Arduino v0.1.8
+#endif  // COMPILE_NETWORK
 
 #ifdef COMPILE_ETHERNET
 #include <ETH.h>
 #endif                                      // COMPILE_ETHERNET
 
 #ifdef COMPILE_WIFI
-#include "ESP32OTAPull.h" //http://librarymanager/All#ESP-OTA-Pull Used for getting new firmware from RTK Binaries repo
 #include "esp_wifi.h"     //Needed for esp_wifi_set_protocol()
-#include <DNSServer.h>    //Built-in.
-#include <ESPmDNS.h>      //Built-in.
-#include <HTTPClient.h>   //Built-in. Needed for ThingStream API for ZTP
-#include <MqttClient.h>   //http://librarymanager/All#ArduinoMqttClient by Arduino v0.1.8
 #include <WiFi.h>         //Built-in.
 #include <WiFiClientSecure.h> //Built-in.
 #include <WiFiMulti.h>        //Built-in.

Firmware/RTK_Everywhere/WiFi.ino

@@ -184,6 +184,12 @@ byte wifiGetStatus()
     return WiFi.status();
 }
 
+// Set AP mode
+void wifiSetApMode()
+{
+    WiFi.mode(WIFI_AP);
+}
+
 // Update the state of the WiFi state machine
 void wifiSetState(byte newState)
 {

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -595,7 +595,7 @@ void otaUpdate()
 
     // Update failed. If we were in WIFI_AP mode, return to WIFI_AP mode
     if (wasInAPmode)
-        WiFi.mode(WIFI_AP);
+        wifiSetApMode();
 
     // Update failed. If WiFi was originally off, turn it off again
     if (previouslyConnected == false)

Firmware/RTK_Everywhere/settings.h

@@ -1986,7 +1986,7 @@ struct struct_tasks
     bool updateWebServerTaskStopRequest = false;
 } task;
 
-#ifdef COMPILE_WIFI
+#ifdef COMPILE_NETWORK
 // AWS certificate for PointPerfect API
 static const char *AWS_PUBLIC_CERT = R"=====(
 -----BEGIN CERTIFICATE-----
@@ -2010,5 +2010,5 @@ o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
 rqXRfboQnoZsG4q5WTP468SQvvG5
 -----END CERTIFICATE-----
 )=====";
-#endif // COMPILE_WIFI
+#endif // COMPILE_NETWORK
 #endif // __SETTINGS_H__