Move WiFi mode changes after esp_wifi_set_protocol()

esp_wifi_set_protocol turns off WiFi Station to set the protocols.

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -93,23 +93,28 @@ void espnowStart()
   if (wifiState == WIFI_OFF && espnowState == ESPNOW_OFF)
   {
     //Radio is off, turn it on
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR); //Stops WiFi Station.
+
     WiFi.mode(WIFI_STA);
 
-    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR);
-    Serial.println("WiFi off, ESP-Now added to protocols");
+    log_d("WiFi off, ESP-Now added to protocols");
   }
   //If WiFi is on but ESP NOW is off, then enable LR protocol
   else if (wifiState > WIFI_OFF && espnowState == ESPNOW_OFF)
   {
     //Enable WiFi + ESP-Now
     // Enable long range, PHY rate of ESP32 will be 512Kbps or 256Kbps
-    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_LR);
-    Serial.println("WiFi on, ESP-Now added to protocols");
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_LR); //Stops WiFi Station.
+
+    WiFi.mode(WIFI_STA);
+
+    log_d("WiFi on, ESP-Now added to protocols");
   }
-  //If ESP-Now is active, WiFi is active, do nothing
+
+  //If ESP-Now is already active, do nothing
   else
   {
-    Serial.println("WiFi already on, ESP-Now already on");
+    log_d("ESP-Now already on");
   }
 
   // Init ESP-NOW
@@ -164,14 +169,20 @@ void espnowStop()
   {
     //ESP Now is the only thing using the radio, turn it off entirely
     WiFi.mode(WIFI_OFF);
-    Serial.println("WiFi Radio off entirely");
+
+    log_d("WiFi Radio off entirely");
   }
   //If WiFi is on, then disable LR protocol
   else if (wifiState > WIFI_OFF)
   {
+    wifiSetState(WIFI_NOT_CONNECTED);
+
     // Return protocol to default settings (no WIFI_PROTOCOL_LR for ESP NOW)
-    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
-    Serial.println("WiFi protocols on, LR protocol off");
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Stops WiFi Station.
+
+    WiFi.mode(WIFI_STA);
+    
+    log_d("WiFi protocols on, LR protocol off");
   }
 
   // Turn off promiscuous WiFi mode

Firmware/RTK_Surveyor/WiFi.ino

@@ -145,13 +145,14 @@ void wifiStartAP()
   //Connect to local router
 #define WIFI_SSID "TRex"
 #define WIFI_PASSWORD "parachutes"
-  WiFi.mode(WIFI_STA);
 
 #ifdef COMPILE_ESPNOW
   // Return protocol to default settings (no WIFI_PROTOCOL_LR for ESP NOW)
-  esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
+  esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Stops WiFi Station
 #endif
 
+  WiFi.mode(WIFI_STA);
+
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("WiFi connecting to");
   while (wifiGetStatus() != WL_CONNECTED)
@@ -161,15 +162,16 @@ void wifiStartAP()
   }
   Serial.print("WiFi connected with IP: ");
   Serial.println(WiFi.localIP());
-#else   //LOCAL_WIFI_TESTING
+#else   //End LOCAL_WIFI_TESTING
   //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);
+  esp_wifi_set_protocol(WIFI_IF_AP, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Stops WiFi AP.
 #endif
 
+  WiFi.mode(WIFI_AP);
+
   IPAddress local_IP(192, 168, 4, 1);
   IPAddress gateway(192, 168, 1, 1);
   IPAddress subnet(255, 255, 255, 0);
@@ -182,7 +184,7 @@ void wifiStartAP()
   }
   Serial.print("WiFi AP Started with IP: ");
   Serial.println(WiFi.softAPIP());
-#endif  //LOCAL_WIFI_TESTING
+#endif  //End AP Testing
 }
 
 #endif  //COMPILE_WIFI
@@ -209,27 +211,23 @@ void wifiStart(char* ssid, char* pw)
 #ifdef COMPILE_WIFI
   if ((wifiState == WIFI_OFF) || (wifiState == WIFI_ON))
   {
-      WiFi.mode(WIFI_STA);
+    wifiSetState(WIFI_NOTCONNECTED);
 
 #ifdef COMPILE_ESPNOW
     if (espnowState > ESPNOW_OFF)
-    {
-      esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_LR); //Enable WiFi + ESP-Now
-    }
+      esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N | WIFI_PROTOCOL_LR); //Enable WiFi + ESP-Now. Stops WiFi Station.
     else
-    {
-      esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Set basic WiFi protocols
-    }
+      esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Set basic WiFi protocols. Stops WiFi Station.
 #else
     //Be sure the standard protocols are turned on. ESP Now have have previously turned them off.
-    WiFi.mode(WIFI_STA);
-    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Set basic WiFi protocols. Stops WiFi Station.
 #endif
 
+    WiFi.mode(WIFI_STA);
+
     Serial.printf("WiFi connecting to %s\r\n", ssid);
     WiFi.begin(ssid, pw);
     wifiTimer = millis();
-    wifiSetState(WIFI_NOTCONNECTED);
 
     //Display the heap state
     reportHeapNow();
@@ -254,26 +252,26 @@ void wifiStop()
   //If WiFi is on but ESP NOW is off, then turn off radio entirely
   else if (espnowState == ESPNOW_OFF)
   {
-    WiFi.mode(WIFI_OFF);
     wifiSetState(WIFI_OFF);
+    WiFi.mode(WIFI_OFF);
     Serial.println("WiFi Stopped");
   }
   //If ESP-Now is active, change protocol to only Long Range
   else if (espnowState > ESPNOW_OFF)
   {
-    WiFi.mode(WIFI_STA);
+    wifiSetState(WIFI_OFF);
 
     // Enable long range, PHY rate of ESP32 will be 512Kbps or 256Kbps
-    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR);
+    esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR); //Stops WiFi Station.
 
-    wifiSetState(WIFI_OFF);
+    WiFi.mode(WIFI_STA);
 
     Serial.println("WiFi disabled, ESP-Now left in place");
   }
 #else
   //Turn off radio
-  WiFi.mode(WIFI_OFF);
   wifiSetState(WIFI_OFF);
+  WiFi.mode(WIFI_OFF);
   Serial.println("WiFi Stopped");
 #endif