ESP-NOW: Replace espnowState with espnowGetState()

Author: LeeLeahy2

Firmware/RTK_Everywhere/Display.ino

@@ -656,7 +656,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
             uint8_t numberOfRadios = 1; // Bluetooth always indicated. TODO don't count if BT radio type is OFF.
             if (WIFI_IS_RUNNING())
                 numberOfRadios++;
-            if (espnowState > ESPNOW_OFF)
+            if (espnowGetState() > ESPNOW_OFF)
                 numberOfRadios++;
 
             // Bluetooth only
@@ -673,7 +673,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 // Do we have WiFi or ESP
                 if (WIFI_IS_RUNNING())
                     setWiFiIcon_TwoRadios(iconList);
-                else if (espnowState > ESPNOW_OFF)
+                else if (espnowGetState() > ESPNOW_OFF)
                     setESPNowIcon_TwoRadios(iconList);
 
                 setModeIcon(iconList); // Turn on Rover/Base type icons
@@ -753,7 +753,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
             }
 #endif // /COMPILE_CELLULAR
 
-            if (espnowState == ESPNOW_PAIRED) // ESPNOW : Columns 64 - 71
+            if (espnowGetState() == ESPNOW_PAIRED) // ESPNOW : Columns 64 - 71
             {
                 iconPropertyBlinking prop;
                 prop.duty = 0b11111111;
@@ -792,7 +792,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 }
             }
 
-            if (espnowState == ESPNOW_PAIRED)
+            if (espnowGetState() == ESPNOW_PAIRED)
             {
                 if (espnowIncomingRTCM == true) // Download : Columns 74 - 81
                 {
@@ -1023,7 +1023,7 @@ void setBluetoothIcon_TwoRadios(std::vector<iconPropertyBlinking> *iconList)
 // This is 64x48-specific
 void setESPNowIcon_TwoRadios(std::vector<iconPropertyBlinking> *iconList)
 {
-    if (espnowState == ESPNOW_PAIRED)
+    if (espnowGetState() == ESPNOW_PAIRED)
     {
         if (espnowIncomingRTCM == true || espnowOutgoingRTCM == true)
         {

Firmware/RTK_Everywhere/ESPNOW.ino

@@ -53,6 +53,13 @@ esp_err_t espNowAddPeer(const uint8_t * peerMac)
     return result;
 }
 
+//*********************************************************************
+// Get the current ESP-NOW state
+ESPNOWState espnowGetState()
+{
+    return espnowState;
+}
+
 //----------------------------------------------------------------------
 // ESP-NOW bringup from example 4_9_ESP_NOW
 //   1. Set station mode

Firmware/RTK_Everywhere/WiFi.ino

@@ -2728,7 +2728,7 @@ bool wifiConnect(bool startWiFiStation, bool startWiFiAP, unsigned long timeout)
         systemPrintf("Failed to get protocols: %s\r\n", esp_err_to_name(response));
 
     // If ESP-NOW is running, blend in ESP-NOW protocol.
-    if (espnowState > ESPNOW_OFF)
+    if (espnowGetState() > ESPNOW_OFF)
     {
         if (protocols != (WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_LR))
         {
@@ -3233,7 +3233,7 @@ void wifiStop()
     wifiFailedConnectionAttempts = 0; // Reset the counter
 
     // If ESP-Now is active, change protocol to only Long Range
-    if (espnowState > ESPNOW_OFF)
+    if (espnowGetState() > ESPNOW_OFF)
     {
         if (WiFi.getMode() != WIFI_STA)
             WiFi.mode(WIFI_STA);

Firmware/RTK_Everywhere/menuMain.ino

@@ -619,7 +619,7 @@ void menuRadio()
             byte bContinue = getUserInputCharacterNumber();
             if (bContinue == 'y')
             {
-                if (espnowState > ESPNOW_OFF)
+                if (espnowGetState() > ESPNOW_OFF)
                 {
                     for (int x = 0; x < settings.espnowPeerCount; x++)
                         espnowRemovePeer(settings.espnowPeers[x]);
@@ -643,7 +643,7 @@ void menuRadio()
         }
         else if (settings.enableEspNow == true && incoming == 5 && settings.debugEspNow == true)
         {
-            if (espnowState == ESPNOW_OFF)
+            if (espnowGetState() == ESPNOW_OFF)
                 espnowStart();
 
             uint8_t peer1[] = {0xB8, 0xD6, 0x1A, 0x0D, 0x8F, 0x9C}; // Random MAC
@@ -667,7 +667,7 @@ void menuRadio()
         }
         else if (settings.enableEspNow == true && incoming == 6 && settings.debugEspNow == true)
         {
-            if (espnowState == ESPNOW_OFF)
+            if (espnowGetState() == ESPNOW_OFF)
                 espnowStart();
 
             uint8_t espnowData[] =
@@ -680,7 +680,7 @@ void menuRadio()
         }
         else if (settings.enableEspNow == true && incoming == 7 && settings.debugEspNow == true)
         {
-            if (espnowState == ESPNOW_OFF)
+            if (espnowGetState() == ESPNOW_OFF)
                 espnowStart();
 
             uint8_t espnowData[] =