WiFi: Replace wifiIsRunning with WIFI_IS_RUNNING macro

Author: LeeLeahy2

Firmware/RTK_Everywhere/Developer.ino

@@ -202,7 +202,7 @@ void menuWiFi() {systemPrintln("**WiFi not compiled**");}
 bool wifiApIsRunning() {return false;}
 bool wifiConnect(bool startWiFiStation, bool startWiFiAP, unsigned long timeout) {return false;}
 uint32_t wifiGetStartTimeout() {return 0;}
-bool wifiIsRunning() {return false;}
+#define WIFI_IS_RUNNING()
 int wifiNetworkCount() {return 0;}
 void wifiResetThrottleTimeout() {}
 void wifiResetTimeout() {}

Firmware/RTK_Everywhere/Display.ino

@@ -654,7 +654,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
 
             // Count the number of radios in use
             uint8_t numberOfRadios = 1; // Bluetooth always indicated. TODO don't count if BT radio type is OFF.
-            if (wifiIsRunning())
+            if (WIFI_IS_RUNNING())
                 numberOfRadios++;
             if (espnowState > ESPNOW_OFF)
                 numberOfRadios++;
@@ -671,7 +671,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 setBluetoothIcon_TwoRadios(iconList);
 
                 // Do we have WiFi or ESP
-                if (wifiIsRunning())
+                if (WIFI_IS_RUNNING())
                     setWiFiIcon_TwoRadios(iconList);
                 else if (espnowState > ESPNOW_OFF)
                     setESPNowIcon_TwoRadios(iconList);
@@ -706,7 +706,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 iconList->push_back(prop);
             }
 
-            if (wifiIsRunning()) // WiFi : Columns 34 - 46
+            if (WIFI_IS_RUNNING()) // WiFi : Columns 34 - 46
             {
 #ifdef COMPILE_WIFI
                 int wifiRSSI = WiFi.RSSI();

Firmware/RTK_Everywhere/ESPNOW.ino

@@ -594,7 +594,7 @@ void espnowStart()
     if (response != ESP_OK)
         systemPrintf("espnowStart: Failed to get protocols: %s\r\n", esp_err_to_name(response));
 
-    if ((wifiIsRunning() == false) && espnowState == ESPNOW_OFF)
+    if ((WIFI_IS_RUNNING() == false) && espnowState == ESPNOW_OFF)
     {
         // Radio is off, turn it on
         if (protocols != (WIFI_PROTOCOL_LR))
@@ -615,7 +615,7 @@ void espnowStart()
         }
     }
     // If WiFi is on but ESP NOW is off, then enable LR protocol
-    else if (wifiIsRunning() && espnowState == ESPNOW_OFF)
+    else if (WIFI_IS_RUNNING() && espnowState == ESPNOW_OFF)
     {
         // Enable WiFi + ESP-Now
         // Enable long range, PHY rate of ESP32 will be 512Kbps or 256Kbps
@@ -788,7 +788,7 @@ void espnowStop()
 
     espnowSetState(ESPNOW_OFF);
 
-    if (wifiIsRunning() == false)
+    if (WIFI_IS_RUNNING() == false)
     {
         // ESP-NOW was the only thing using the radio so turn WiFi radio off entirely
         WiFi.mode(WIFI_OFF);
@@ -797,7 +797,7 @@ void espnowStop()
             systemPrintln("WiFi Radio off entirely");
     }
     // If WiFi is on, then restart WiFi
-    else if (wifiIsRunning())
+    else if (WIFI_IS_RUNNING())
     {
         if (settings.debugEspNow == true)
             systemPrintln("ESP-Now starting WiFi");

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -306,6 +306,7 @@ char logFileName[sizeof("SFE_Reference_Station_230101_120101.ubx_plusExtraSpace"
 int packetRSSI;
 RTK_WIFI wifi(false);
 
+#define WIFI_IS_RUNNING()               wifiIsRunning()
 #define WIFI_STOP()                                                                                                    \
     {                                                                                                                  \
         if (settings.debugWifiState)                                                                                   \

Firmware/RTK_Everywhere/menuMain.ino

@@ -630,7 +630,7 @@ void menuRadio()
         }
         else if (settings.enableEspNow == true && incoming == 4)
         {
-            if (wifiIsRunning() == false)
+            if (WIFI_IS_RUNNING() == false)
             {
                 if (getNewSetting("Enter the WiFi channel to use for ESP-NOW communication", 1, 14,
                                   &settings.wifiChannel) == INPUT_RESPONSE_VALID)