WiFi Should Reconnect For Most Reasons

See also issue espressif#7210

Author: mrengineer7777

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

@@ -960,22 +960,20 @@ 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)))
-        {
+	
+        bool DoReconnect = false;
+	    
+        if(first_connect && (reason != WIFI_REASON_ASSOC_LEAVE)) {
+            first_connect = false;
             log_d("WiFi Reconnect Running");
             WiFi.disconnect();
             WiFi.begin();
-            first_connect = false;
+
         }
-        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() ) {
+            log_d("WiFi AutoReconnect Running");
+            WiFi.disconnect();
+            WiFi.begin();
         }
         else if (reason == WIFI_REASON_ASSOC_FAIL){
             WiFiSTAClass::_setStatus(WL_CONNECT_FAILED);
@@ -1063,6 +1061,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)