WiFi Should Reconnect For Most Reasons

See also issue espressif#7210

Author: mrengineer7777

Diff for: libraries/WiFi/src/WiFiGeneric.cpp

@@ -925,6 +925,29 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event)
 {
     static bool first_connect = true;
 
+    if(event->event_id < ARDUINO_EVENT_MAX) {
+        log_d("Arduino Event: %d - %s", event->event_id, arduino_event_names[event->event_id]);
+    }
+    if(event->event_id == ARDUINO_EVENT_WIFI_SCAN_DONE) {
+        WiFiScanClass::_scanDone();
+
+    } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_START) {
+        WiFiSTAClass::_setStatus(WL_DISCONNECTED);
+        setStatusBits(STA_STARTED_BIT);
+        if(esp_wifi_set_ps(_sleepEnabled) != ESP_OK){
+            log_e("esp_wifi_set_ps failed");
+        }
+    } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_STOP) {
+        WiFiSTAClass::_setStatus(WL_NO_SHIELD);
+        clearStatusBits(STA_STARTED_BIT | STA_CONNECTED_BIT | STA_HAS_IP_BIT | STA_HAS_IP6_BIT);
+    } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_CONNECTED) {
+        WiFiSTAClass::_setStatus(WL_IDLE_STATUS);
+        setStatusBits(STA_CONNECTED_BIT);
+
+        //esp_netif_create_ip6_linklocal(esp_netifs[ESP_IF_WIFI_STA]);
+    } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_DISCONNECTED) {
+    static bool first_connect = true;
+
     if(event->event_id < ARDUINO_EVENT_MAX) {
         log_d("Arduino Event: %d - %s", event->event_id, arduino_event_names[event->event_id]);
     }
@@ -960,26 +983,26 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event)
             WiFiSTAClass::_setStatus(WL_DISCONNECTED);
         }
         clearStatusBits(STA_CONNECTED_BIT | STA_HAS_IP_BIT | STA_HAS_IP6_BIT);
-        if(first_connect && ((reason == WIFI_REASON_AUTH_EXPIRE) ||
-        (reason >= WIFI_REASON_BEACON_TIMEOUT)))
-        {
-            log_d("WiFi Reconnect Running");
-            WiFi.disconnect();
-            WiFi.begin();
+
+        bool DoReconnect = false;
+        if(reason == WIFI_REASON_ASSOC_LEAVE) {                                     //Voluntarily disconnected. Don't reconnect!
+        }
+        else if(first_connect) {                                                    //Retry once for all failure reasons
             first_connect = false;
+            DoReconnect = true;
+            log_d("WiFi Reconnect Running");
         }
-        else if(WiFi.getAutoReconnect()){
-            if((reason == WIFI_REASON_AUTH_EXPIRE) ||
-            (reason >= WIFI_REASON_BEACON_TIMEOUT && reason != WIFI_REASON_AUTH_FAIL))
-            {
-                log_d("WiFi AutoReconnect Running");
-                WiFi.disconnect();
-                WiFi.begin();
-            }
+        else if(WiFi.getAutoReconnect() && _isReconnectableReason(reason)) {
+            DoReconnect = true;
+            log_d("WiFi AutoReconnect Running");
         }
-        else if (reason == WIFI_REASON_ASSOC_FAIL){
+        else if(reason == WIFI_REASON_ASSOC_FAIL) {
             WiFiSTAClass::_setStatus(WL_CONNECT_FAILED);
         }
+        if(DoReconnect) {
+            WiFi.disconnect();
+            WiFi.begin();
+        }
     } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_GOT_IP) {
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
         uint8_t * ip = (uint8_t *)&(event->event_info.got_ip.ip_info.ip.addr);
@@ -1063,6 +1086,12 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event)
     return ESP_OK;
 }
 
+bool WiFiGenericClass::_isReconnectableReason(uint8_t reason) {
+	return (reason == WIFI_REASON_AUTH_EXPIRE) ||
+           (reason == WIFI_REASON_ASSOC_EXPIRE) ||
+           (reason >= WIFI_REASON_BEACON_TIMEOUT);
+}
+
 /**
  * Return the current channel associated with the network
  * @return channel (1-13)

Diff for: libraries/WiFi/src/WiFiGeneric.h

@@ -206,6 +206,9 @@ class WiFiGenericClass
 
     static int setStatusBits(int bits);
     static int clearStatusBits(int bits);
+	
+  private:
+    static bool _isReconnectableReason(uint8_t reason);
 
   public:
     static int hostByName(const char *aHostname, IPAddress &aResult);