Stop ESP-Now before turning stopping WiFi

Author: nseidle

Firmware/RTK_Surveyor/ESPNOW.ino

@@ -165,6 +165,21 @@ void espnowStop()
 #ifdef COMPILE_ESPNOW
   if (espnowState == ESPNOW_OFF) return;
 
+  // Turn off promiscuous WiFi mode
+  esp_wifi_set_promiscuous(false);
+  esp_wifi_set_promiscuous_rx_cb(NULL);
+
+  // Deregister callbacks
+  //esp_now_unregister_send_cb();
+  esp_now_unregister_recv_cb();
+
+  // Deinit ESP-NOW
+  if (esp_now_deinit() != ESP_OK) {
+    Serial.println("Error deinitializing ESP-NOW");
+    return;
+  }
+#endif
+
   if (wifiState == WIFI_OFF)
   {
     //ESP Now is the only thing using the radio, turn it off entirely
@@ -175,7 +190,9 @@ void espnowStop()
   //If WiFi is on, then disable LR protocol
   else if (wifiState > WIFI_OFF)
   {
-    wifiSetState(WIFI_NOT_CONNECTED);
+#ifdef COMPILE_WIFI
+    wifiSetState(WIFI_NOTCONNECTED);
+#endif
 
     // 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.
@@ -184,21 +201,7 @@ void espnowStop()
 
     log_d("WiFi protocols on, LR protocol off");
   }
-
-  // Turn off promiscuous WiFi mode
-  esp_wifi_set_promiscuous(false);
-  esp_wifi_set_promiscuous_rx_cb(NULL);
-
-  // Deregister callbacks
-  //esp_now_unregister_send_cb();
-  esp_now_unregister_recv_cb();
-
-  // Deinit ESP-NOW
-  if (esp_now_deinit() != ESP_OK) {
-    Serial.println("Error deinitializing ESP-NOW");
-    return;
-  }
-#endif
+    
   espnowSetState(ESPNOW_OFF);
 }