WiFi: Replace wifiApIsRunning with WIFI_SOFT_AP_RUNNING

Author: LeeLeahy2

Firmware/RTK_Everywhere/Developer.ino

@@ -206,6 +206,7 @@ uint32_t wifiGetStartTimeout() {return 0;}
 int wifiNetworkCount() {return 0;}
 void wifiResetThrottleTimeout() {}
 void wifiResetTimeout() {}
+#define WIFI_SOFT_AP_RUNNING() {return false;}
 bool wifiStart() {return false;}
 bool wifiStationIsRunning() {return false;}
 #define WIFI_STOP() {}

Firmware/RTK_Everywhere/Network.ino

@@ -519,7 +519,7 @@ IPAddress networkGetIpAddress()
     IPAddress ip;
 
     // NETIF doesn't capture the IP address of a soft AP
-    if (wifiApIsRunning() == true && wifiStationIsRunning() == false)
+    if (WIFI_SOFT_AP_RUNNING() == true && wifiStationIsRunning() == false)
         return WiFi.softAPIP();
 
     // Get the networkInterfaceTable index
@@ -1491,7 +1491,7 @@ void networkUpdate()
         if ((networkHasInternet() == false) && (consumerTypes & (1 << NETCONSUMER_CELLULAR)))
         {
             // If we're in AP only mode (no internet), don't start cellular
-            if (wifiApIsRunning() == false)
+            if (WIFI_SOFT_AP_RUNNING() == false)
             {
                 // Don't start cellular until WiFi has failed to connect
                 if (wifiUnavailable() == true)

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -308,6 +308,7 @@ RTK_WIFI wifi(false);
 
 #define WIFI_IS_CONNECTED()             wifiIsConnected()
 #define WIFI_IS_RUNNING()               wifiIsRunning()
+#define WIFI_SOFT_AP_RUNNING()          wifiApIsRunning()
 #define WIFI_STOP()                                                                                                    \
     {                                                                                                                  \
         if (settings.debugWifiState)                                                                                   \

Firmware/RTK_Everywhere/TcpServer.ino

@@ -391,7 +391,7 @@ void tcpServerUpdate()
             tcpServerStop();
 
         // Wait until the network is connected to the media
-        else if (networkHasInternet() || wifiApIsRunning())
+        else if (networkHasInternet() || WIFI_SOFT_AP_RUNNING())
         {
             // Delay before starting the TCP server
             if ((millis() - tcpServerTimer) >= (1 * 1000))
@@ -409,7 +409,7 @@ void tcpServerUpdate()
     // Handle client connections and link failures
     case TCP_SERVER_STATE_RUNNING:
         // Determine if the network has failed
-        if ((networkHasInternet() == false && wifiApIsRunning() == false) || (!settings.enableTcpServer && !settings.baseCasterOverride))
+        if ((networkHasInternet() == false && WIFI_SOFT_AP_RUNNING() == false) || (!settings.enableTcpServer && !settings.baseCasterOverride))
         {
             if ((settings.debugTcpServer || PERIODIC_DISPLAY(PD_TCP_SERVER_DATA)) && (!inMainMenu))
             {

Firmware/RTK_Everywhere/UdpServer.ino

@@ -335,7 +335,7 @@ void udpServerUpdate()
             udpServerStop();
 
         // Wait until the network is connected
-        else if (networkHasInternet() || wifiApIsRunning())
+        else if (networkHasInternet() || WIFI_SOFT_AP_RUNNING())
         {
             // Delay before starting the UDP server
             if ((millis() - udpServerTimer) >= (1 * 1000))
@@ -353,7 +353,7 @@ void udpServerUpdate()
     // Handle client connections and link failures
     case UDP_SERVER_STATE_RUNNING:
         // Determine if the network has failed
-        if ((networkHasInternet() == false && wifiApIsRunning() == false) || (!settings.enableUdpServer && !settings.baseCasterOverride))
+        if ((networkHasInternet() == false && WIFI_SOFT_AP_RUNNING() == false) || (!settings.enableUdpServer && !settings.baseCasterOverride))
         {
             if ((settings.debugUdpServer || PERIODIC_DISPLAY(PD_UDP_SERVER_DATA)) && (!inMainMenu))
             {

Firmware/RTK_Everywhere/WebServer.ino

@@ -779,7 +779,7 @@ void webServerUpdate()
     // Wait for connection to the network
     case WEBSERVER_STATE_WAIT_FOR_NETWORK:
         // Wait until the network is connected to the internet or has WiFi AP
-        if (networkHasInternet() || wifiApIsRunning())
+        if (networkHasInternet() || WIFI_SOFT_AP_RUNNING())
         {
             if (settings.debugWebServer)
                 systemPrintln("Web Server connected to network");
@@ -791,7 +791,7 @@ void webServerUpdate()
     // Start the web server
     case WEBSERVER_STATE_NETWORK_CONNECTED: {
         // Determine if the network has failed
-        if (networkHasInternet() == false && wifiApIsRunning() == false)
+        if (networkHasInternet() == false && WIFI_SOFT_AP_RUNNING() == false)
             webServerStop();
         if (settings.debugWebServer)
             systemPrintln("Assigning web server resources");
@@ -807,7 +807,7 @@ void webServerUpdate()
     // Allow web services
     case WEBSERVER_STATE_RUNNING:
         // Determine if the network has failed
-        if (networkHasInternet() == false && wifiApIsRunning() == false)
+        if (networkHasInternet() == false && WIFI_SOFT_AP_RUNNING() == false)
             webServerStop();
 
         // This state is exited when webServerStop() is called

Firmware/RTK_Everywhere/WiFi.ino

@@ -3127,7 +3127,7 @@ bool wifiStart()
 
     // If we are in AP only mode, as long as the AP is started, return true
     if (WiFi.getMode() == WIFI_MODE_AP)
-        return (wifiApIsRunning);
+        return WIFI_SOFT_AP_RUNNING();
 
     // If we are in STA or AP+STA mode, return if the station connected successfully
     wifiStatus = WiFi.status();