Reduce reliance on ESPNOW compile guards

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -762,7 +762,6 @@ void beginI2C()
 //Depending on radio selection, begin hardware
 void radioStart()
 {
-#ifdef COMPILE_ESPNOW
   if (settings.radioType == RADIO_EXTERNAL)
   {
     espnowStop();
@@ -773,7 +772,6 @@ void radioStart()
   {
     espnowStart();
   }
-#endif
 }
 
 //Start task to determine SD card size

Firmware/RTK_Surveyor/Display.ino

@@ -796,8 +796,6 @@ uint32_t setESPNowIcon_TwoRadios()
 {
   uint32_t icons = 0;
 
-#ifdef COMPILE_ESPNOW
-
   if (espnowState == ESPNOW_PAIRED)
   {
     //Limit how often we update this spot
@@ -866,7 +864,6 @@ uint32_t setESPNowIcon_TwoRadios()
     else
       icons |= ICON_BLANK_LEFT;
   }
-#endif //ifdef COMPILE_ESPNOW
 
   return icons;
 }

Firmware/RTK_Surveyor/NVM.ino

@@ -1006,7 +1006,6 @@ bool parseLine(char* str, Settings *settings)
     }
 
     //Scan for ESPNOW peers
-#ifdef COMPILE_ESPNOW
     if (knownSetting == false)
     {
       for (int x = 0 ; x < ESPNOW_MAX_PEERS ; x++)
@@ -1031,7 +1030,6 @@ bool parseLine(char* str, Settings *settings)
         }
       }
     }
-#endif //ifdef COMPILE_ESPNOW
 
     //Last catch
     if (knownSetting == false)

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -406,12 +406,14 @@ uint8_t espnowOutgoingSpot = 0; //ESP Now has max of 250 characters
 uint16_t espnowBytesSent = 0; //May be more than 255
 uint8_t receivedMAC[6]; //Holds the broadcast MAC during pairing
 
-int espnowRSSI = 0;
 int packetRSSI = 0;
 unsigned long lastEspnowRssiUpdate = 0;
 
-const uint8_t ESPNOW_MAX_PEERS = 5; //Maximum of 5 rovers
 #endif
+
+int espnowRSSI = 0;
+const uint8_t ESPNOW_MAX_PEERS = 5; //Maximum of 5 rovers
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Global variables
@@ -904,7 +906,6 @@ void updateRadio()
       //then we've reached the end of the RTCM stream. Send partial buffer.
       if (espnowOutgoingSpot > 0 && (millis() - espnowLastAdd) > 50)
       {
-
         if (settings.espnowBroadcast == false)
           esp_now_send(0, (uint8_t *) &espnowOutgoing, espnowOutgoingSpot); //Send partial packet to all peers
         else

Firmware/RTK_Surveyor/States.ino

@@ -889,7 +889,6 @@ void updateSystemState()
 
       case (STATE_ESPNOW_PAIRING):
         {
-#ifdef COMPILE_ESPNOW
           if (espnowIsPaired() == true)
           {
             paintEspNowPaired();
@@ -902,7 +901,6 @@ void updateSystemState()
             uint8_t broadcastMac[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
             espnowSendPairMessage(broadcastMac); //Send unit's MAC address over broadcast, no ack, no encryption
           }
-#endif
         }
         break;
 

Firmware/RTK_Surveyor/WiFi.ino

@@ -136,10 +136,9 @@ void wifiStartAP()
     //Start in AP mode
     WiFi.mode(WIFI_AP);
 
-#ifdef COMPILE_ESPNOW
-    // Return protocol to default settings (no WIFI_PROTOCOL_LR for ESP NOW)
-    esp_wifi_set_protocol(WIFI_IF_AP, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Stops WiFi AP.
-#endif
+    //Before attempting WiFiMulti connect, be sure we have default WiFi protocols enabled.
+    //This must come after WiFi.mode
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
 
     IPAddress local_IP(192, 168, 4, 1);
     IPAddress gateway(192, 168, 4, 1);
@@ -337,7 +336,6 @@ void wifiStop()
   WiFi.mode(WIFI_OFF);
   log_d("WiFi Stopped");
 
-#ifdef COMPILE_ESPNOW
   //If ESP-Now is active, change protocol to only Long Range and re-start WiFi
   if (espnowState > ESPNOW_OFF)
   {
@@ -348,7 +346,6 @@ void wifiStop()
 
     log_d("WiFi disabled, ESP-Now left in place");
   }
-#endif
 
   //Display the heap state
   reportHeapNow();