Simplify ESP-NOW vs WiFi config

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -89,24 +89,21 @@ void promiscuous_rx_cb(void *buf, wifi_promiscuous_pkt_type_t type)
 //If the radio is off entirely, start the radio, turn on only the LR protocol
 void espnowStart()
 {
-
 #ifdef COMPILE_ESPNOW
   if (wifiState == WIFI_OFF && espnowState == ESPNOW_OFF)
   {
-    WiFi.mode(WIFI_STA);
-
     //Radio is off, turn it on
     esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR); //Stops WiFi Station.
 
+    WiFi.mode(WIFI_STA);
+    
     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)
   {
-    WiFi.mode(WIFI_STA);
-
     //Enable WiFi + ESP-Now
-    // Enable long range, PHY rate of ESP32 will be 512Kbps or 256Kbps
+    //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); //Stops WiFi Station.
 
     log_d("WiFi on, ESP-Now added to protocols");
@@ -181,43 +178,43 @@ void espnowStop()
 #ifdef COMPILE_ESPNOW
   if (espnowState == ESPNOW_OFF) return;
 
-  // Turn off promiscuous WiFi mode
+  //Turn off promiscuous WiFi mode
   esp_wifi_set_promiscuous(false);
   esp_wifi_set_promiscuous_rx_cb(NULL);
 
-  // Deregister callbacks
+  //Deregister callbacks
   //esp_now_unregister_send_cb();
   esp_now_unregister_recv_cb();
 
-  // Deinit ESP-NOW
+  //Forget all ESP-Now Peers
+  for (int x = 0 ; x < settings.espnowPeerCount ; x++)
+    espnowRemovePeer(settings.espnowPeers[x]);
+
+  //Leave WiFi with 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); //Stops WiFi Station.
+
+  //Deinit ESP-NOW
   if (esp_now_deinit() != ESP_OK) {
     systemPrintln("Error deinitializing ESP-NOW");
     return;
   }
 
+  espnowSetState(ESPNOW_OFF);
+
   if (wifiState == WIFI_OFF)
   {
     //ESP Now was the only thing using the radio so turn WiFi radio off entirely
     WiFi.mode(WIFI_OFF);
 
     log_d("WiFi Radio off entirely");
   }
-  //If WiFi is on, then disable LR protocol
+  //If WiFi is on, then restart WiFi
   else if (wifiState > WIFI_OFF)
   {
-    wifiSetState(WIFI_START); //Force WiFi to restart
-
-    // 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); //Stops WiFi Station.
-
-    WiFi.mode(WIFI_STA);
-
-    log_d("WiFi protocols on, LR protocol off");
+    wifiStart(); //Force WiFi to restart
   }
 
 #endif
-
-  espnowSetState(ESPNOW_OFF);
 }
 
 //Start ESP-Now if needed, put ESP-Now into broadcast state

Firmware/RTK_Surveyor/NtripClient.ino

@@ -465,7 +465,7 @@ void ntripClientUpdate()
       if (!ntripClient->connected())
       {
         //Broken connection, retry the NTRIP client connection
-        systemPrintln("NTRIP Client connection dropped");
+        systemPrintln("NTRIP Client connection to caster was broken");
         ntripClientStop(false); //Allocate new wifiClient
       }
       else

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -669,7 +669,7 @@ void loop()
   tcpUpdate(); //Turn on TCP Client or Server as needed
 
   printPosition(); //Periodically print GNSS coordinates if enabled
-  
+
   //A small delay prevents panic if no other I2C or functions are called
   delay(10);
 }

Firmware/RTK_Surveyor/WiFi.ino

@@ -102,6 +102,7 @@ void wifiSetState(byte newState)
   if (wifiState == newState)
     systemPrint("*");
   wifiState = newState;
+
   switch (newState)
   {
     default:
@@ -156,12 +157,7 @@ void wifiStartAP()
   else
   {
     //Start webserver on local WiFi instead of AP
-    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); //Stops WiFi Station
-#endif
+    wifiStart(); //Makes sure any ESP-Now settings have been cleared
 
     //Attempt to connect to local WiFi 3 times with increasing timeouts
     int timeout = 0;
@@ -215,6 +211,12 @@ void wifiUpdate()
         if (wifiConnect(10000) == true) //Attempt to connect to any SSID on settings list
         {
 
+          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. Stops WiFi Station.
+            espnowStart();
+          }
+
           wifiSetState(WIFI_CONNECTED);
         }
         else
@@ -243,7 +245,7 @@ void wifiUpdate()
       //Verify link is still up
       if (wifiIsConnected() == false)
       {
-        log_d("WiFi link lost");
+        systemPrintln("WiFi link lost");
         wifiConnectionAttempts = 0; //Reset the timeout
         wifiSetState(WIFI_CONNECTING);
       }
@@ -268,48 +270,31 @@ void wifiUpdate()
 void wifiStart()
 {
 #ifdef COMPILE_WIFI
-#ifdef COMPILE_ESPNOW
-  bool restartESPNow = false;
-#endif
-
-  if (wifiIsConnected() == true) return; //We don't need to do anything
-
-  if (wifiState > WIFI_OFF) return; //We're in the midst of connecting
-
-  log_d("Starting WiFi");
-
   if (wifiNetworkCount() == 0)
   {
     systemPrintln("Error: Please enter at least one SSID before using WiFi");
     //paintWiFiNoNetworksFail(4000, true); //TODO
-    wifiSetState(WIFI_OFF);
+    wifiStop();
     return;
   }
 
-  wifiSetState(WIFI_CONNECTING); //This starts the state machine running
+  if (wifiIsConnected() == true) return; //We don't need to do anything
+
+  if (wifiState > WIFI_OFF) return; //We're in the midst of connecting
+
+  log_d("Starting WiFi");
 
   WiFi.mode(WIFI_STA);
 
-#ifdef COMPILE_ESPNOW
+  //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);
+
+  //If ESP-NOW is running, blend in ESP-NOW protocol.
   if (espnowState > ESPNOW_OFF)
-  {
-    restartESPNow = true;
-    espnowStop();
     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. Stops WiFi Station.
-  }
-#else
-  //Be sure the standard protocols are turned on. ESP Now may have previously turned them off.
-  esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Set basic WiFi protocols. Stops WiFi Station.
-#endif
 
-#ifdef COMPILE_ESPNOW
-  if (restartESPNow == true)
-    espnowStart();
-#endif
+  wifiSetState(WIFI_CONNECTING); //This starts the state machine running
 
   //Display the heap state
   reportHeapNow();
@@ -348,28 +333,21 @@ void wifiStop()
 
   wifiConnectionAttempts = 0; //Reset the timeout
 
+  //No matter what, turn off WiFi to stop rolling STA_DISCONNECTED and AUTH_EXPIRE notifications
+  WiFi.mode(WIFI_OFF);
+  log_d("WiFi Stopped");
+
 #ifdef COMPILE_ESPNOW
-  //If WiFi is on but ESP NOW is off, then turn off radio entirely
-  if (espnowState == ESPNOW_OFF)
-  {
-    WiFi.mode(WIFI_OFF);
-    log_d("WiFi Stopped");
-  }
-  //If ESP-Now is active, change protocol to only Long Range
-  else if (espnowState > ESPNOW_OFF)
+  //If ESP-Now is active, change protocol to only Long Range and re-start WiFi
+  if (espnowState > ESPNOW_OFF)
   {
-
     // Enable long range, PHY rate of ESP32 will be 512Kbps or 256Kbps
     esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR); //Stops WiFi Station.
 
     WiFi.mode(WIFI_STA);
 
     log_d("WiFi disabled, ESP-Now left in place");
   }
-#else
-  //Turn off radio
-  WiFi.mode(WIFI_OFF);
-  log_d("WiFi Stopped");
 #endif
 
   //Display the heap state
@@ -422,11 +400,6 @@ bool wifiConnect(unsigned long timeout)
   else
     systemPrintf("WiFi failed to connect: error #%d. ", response);
 
-  if (wifiConnectionAttemptTimeout / 1000 < 120)
-    systemPrintf("Next WiFi attempt in %d seconds.\r\n", wifiConnectionAttemptTimeout / 1000);
-  else
-    systemPrintf("Next WiFi attempt in %d minutes.\r\n", wifiConnectionAttemptTimeout / 1000 / 60);
-
 #endif
 
   return false;

Firmware/RTK_Surveyor/menuSystem.ino

@@ -494,6 +494,7 @@ void menuWiFi()
       //Restart WiFi if we are not in AP config mode
       if (wifiIsConnected())
       {
+        log_d("Menu caused restarting of WiFi");
         wifiStop();
         wifiStart();
       }