Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reconnection regression

Browse Source
This commit is contained in:
iranl
2024-08-18 19:26:32 +02:00
committed by GitHub
parent 176db0b78d
commit c4ca957adf
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/WiFiManager/WiFiManager.cpp
View File

@@ -1130,7 +1130,7 @@ bool WiFiManager::wifiConnectNew(String ssid, String pass,bool connect){
DEBUG_WM(F("find best RSSI: TRUE")); DEBUG_WM(F("find best RSSI: TRUE"));
#endif #endif
if (!_numNetworks) if (!_numNetworks)
WiFi_scanNetworks(); // scan in case this gets called before any scans WiFi_scanNetworks(false, false); // scan in case this gets called before any scans
int n = _numNetworks; int n = _numNetworks;
if (n == 0) { if (n == 0) {
@@ -1219,7 +1219,7 @@ bool WiFiManager::wifiConnectDefault(){
DEBUG_WM(F("find best RSSI: TRUE")); DEBUG_WM(F("find best RSSI: TRUE"));
#endif #endif
if (!_numNetworks) if (!_numNetworks)
WiFi_scanNetworks(); // scan in case this gets called before any scans WiFi_scanNetworks(false, false); // scan in case this gets called before any scans
int n = _numNetworks; int n = _numNetworks;
if (n == 0) { if (n == 0) {
@@ -1484,7 +1484,7 @@ void WiFiManager::handleWifi(AsyncWebServerRequest *request,bool scan = true) {
#ifdef WM_DEBUG_LEVEL #ifdef WM_DEBUG_LEVEL
// DEBUG_WM(WM_DEBUG_DEV,"refresh flag:",request->hasArg(F("refresh"))); // DEBUG_WM(WM_DEBUG_DEV,"refresh flag:",request->hasArg(F("refresh")));
#endif #endif
WiFi_scanNetworks(request->hasArg(F("refresh")),false); //wifiscan, force if arg refresh WiFi_scanNetworks(request->hasArg(F("refresh")),true); //wifiscan, force if arg refresh
page += getScanItemOut(); page += getScanItemOut();
} }
String pitem = ""; String pitem = "";
@@ -1589,14 +1589,14 @@ void WiFiManager::WiFi_scanComplete(int networksFound){
} }
bool WiFiManager::WiFi_scanNetworks(){ bool WiFiManager::WiFi_scanNetworks(){
return WiFi_scanNetworks(false,false); return WiFi_scanNetworks(false,true);
} }
bool WiFiManager::WiFi_scanNetworks(unsigned int cachetime,bool async){ bool WiFiManager::WiFi_scanNetworks(unsigned int cachetime,bool async){
return WiFi_scanNetworks(millis()-_lastscan > cachetime,async); return WiFi_scanNetworks(millis()-_lastscan > cachetime,async);
} }
bool WiFiManager::WiFi_scanNetworks(unsigned int cachetime){ bool WiFiManager::WiFi_scanNetworks(unsigned int cachetime){
return WiFi_scanNetworks(millis()-_lastscan > cachetime,false); return WiFi_scanNetworks(millis()-_lastscan > cachetime,true);
} }
bool WiFiManager::WiFi_scanNetworks(bool force,bool async){ bool WiFiManager::WiFi_scanNetworks(bool force,bool async){
#ifdef WM_DEBUG_LEVEL #ifdef WM_DEBUG_LEVEL
@@ -1605,9 +1605,16 @@ bool WiFiManager::WiFi_scanNetworks(bool force,bool async){
// DEBUG_WM(WM_DEBUG_DEV,"scanNetworks force:",force == true); // DEBUG_WM(WM_DEBUG_DEV,"scanNetworks force:",force == true);
#endif #endif
force = false; if(_numNetworks == 0 && _autoforcerescan){
async = true; DEBUG_WM(WM_DEBUG_DEV,"NO APs found forcing new scan");
force = _lastscan == 0; force = true;
}
// if scan is empty or stale (last scantime > _scancachetime), this avoids fast reloading wifi page and constant scan delayed page loads appearing to freeze.
if(!_lastscan || _lastscan == 0 || (_lastscan>0 && (millis()-_lastscan > _scancachetime))){
force = true;
}
//force = _lastscan == 0;
if(force){ if(force){
int8_t res; int8_t res;