Merge branch 'master' of github.com:technyon/nuki_hub

lib/WiFiManager/WiFiManager.cpp

@@ -1124,6 +1124,9 @@ bool WiFiManager::wifiConnectNew(String ssid, String pass,bool connect){
   WiFi.persistent(true);
 
   if (_findBestRSSI) {
+    WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+    WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL);
+    
     #ifdef WM_DEBUG_LEVEL
     DEBUG_WM(F("find best RSSI: TRUE"));
     #endif
@@ -1691,6 +1694,10 @@ bool WiFiManager::WiFi_scanNetworks(bool force,bool async){
     return false;
 }
 
+void WiFiManager::resetScan(){
+    _numNetworks = 0;
+}
+
 String WiFiManager::WiFiManager::getScanItemOut(){
     String page;
 
@@ -4013,7 +4020,7 @@ String WiFiManager::WiFi_psk(bool persistent) const {
       #ifdef WM_DEBUG_LEVEL
         DEBUG_WM(WM_DEBUG_VERBOSE,F("[Event] SYSTEM_EVENT_STA_DISCONNECTED, reconnecting"));
         #endif
-        WiFi.reconnect();
+        //WiFi.reconnect();
       #endif
   }
   else if(event == ARDUINO_EVENT_WIFI_SCAN_DONE && _asyncScan){

lib/WiFiManager/WiFiManager.h

@@ -279,6 +279,9 @@ class WiFiManager
 
     // erase wifi credentials
     void          resetSettings();
+    
+    // reset wifi scan
+    void          resetScan();
 
     // reboot esp
     void          reboot();