adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

WiFi Should Reconnect For Most Reasons (#7344)

Browse source 
Improves WiFi reconnection
This commit is contained in:
David McCurley 2022-11-07 11:56:23 -06:00 committed by GitHub
parent 271cee1061
commit bd71449988
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
libraries/WiFi/src/WiFiGeneric.cpp
View file

@ -963,25 +963,25 @@ 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(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() && _isReconnectableReason(reason)) {
DoReconnect = true;
log_d("WiFi AutoReconnect Running");
}
else if(reason == WIFI_REASON_ASSOC_FAIL) {
WiFiSTAClass::_setStatus(WL_CONNECT_FAILED);
}
if(DoReconnect) {
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 (reason == WIFI_REASON_ASSOC_FAIL){
WiFiSTAClass::_setStatus(WL_CONNECT_FAILED);
}
} else if(event->event_id == ARDUINO_EVENT_WIFI_STA_GOT_IP) {
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
@ -1066,6 +1066,36 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event)
return ESP_OK;
}
bool WiFiGenericClass::_isReconnectableReason(uint8_t reason) {
switch(reason) {
//Timeouts (retry)
case WIFI_REASON_AUTH_EXPIRE:
case WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT:
case WIFI_REASON_GROUP_KEY_UPDATE_TIMEOUT:
case WIFI_REASON_802_1X_AUTH_FAILED:
case WIFI_REASON_HANDSHAKE_TIMEOUT:
//Transient error (reconnect)
case WIFI_REASON_AUTH_LEAVE:
case WIFI_REASON_ASSOC_EXPIRE:
case WIFI_REASON_ASSOC_TOOMANY:
case WIFI_REASON_NOT_AUTHED:
case WIFI_REASON_NOT_ASSOCED:
case WIFI_REASON_ASSOC_NOT_AUTHED:
case WIFI_REASON_MIC_FAILURE:
case WIFI_REASON_IE_IN_4WAY_DIFFERS:
case WIFI_REASON_INVALID_PMKID:
case WIFI_REASON_BEACON_TIMEOUT:
case WIFI_REASON_NO_AP_FOUND:
case WIFI_REASON_ASSOC_FAIL:
case WIFI_REASON_CONNECTION_FAIL:
case WIFI_REASON_AP_TSF_RESET:
case WIFI_REASON_ROAMING:
return true;
default:
return false;
}
}
/**
* Return the current channel associated with the network
* @return channel (1-13)

5
libraries/WiFi/src/WiFiGeneric.h
View file

@ -206,7 +206,10 @@ 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);