From 8448d66ea71dd201b7fb62227aa09dfcacdca4ab Mon Sep 17 00:00:00 2001 From: tablatronix Date: Thu, 22 Apr 2021 17:16:34 -0500 Subject: [PATCH] #1243 clean --- WiFiManager.cpp | 13 +++++++++---- WiFiManager.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 09055c9..f9a2646 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -785,15 +785,20 @@ uint8_t WiFiManager::processConfigPortal(){ if (connectWifi(_ssid, _pass, _connectonsave) == WL_CONNECTED) { #ifdef WM_DEBUG_LEVEL - DEBUG_WM(F("Connect to new AP [SUCCESS]")); - DEBUG_WM(F("Got IP Address:")); - DEBUG_WM(WiFi.localIP()); + if(_connectonsave){ + DEBUG_WM(F("SAVED with no connect to new AP")); + } else { + DEBUG_WM(F("Connect to new AP [SUCCESS]")); + DEBUG_WM(F("Got IP Address:")); + DEBUG_WM(WiFi.localIP()); + } #endif if ( _savewificallback != NULL) { _savewificallback(); } shutdownConfigPortal(); + if(_connectonsave) return WL_IDLE_STATUS; return WL_CONNECTED; // CONNECT SUCCESS } #ifdef WM_DEBUG_LEVEL @@ -920,7 +925,7 @@ uint8_t WiFiManager::connectWifi(String ssid, String pass, bool connect) { wifiConnectNew(ssid,pass,connect); if(_saveTimeout > 0){ connRes = waitForConnectResult(_saveTimeout); // use default save timeout for saves to prevent bugs in esp->waitforconnectresult loop - } + } else { connRes = waitForConnectResult(0); } diff --git a/WiFiManager.h b/WiFiManager.h index a236bde..420b533 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -432,7 +432,7 @@ class WiFiManager unsigned long _startscan = 0; // ms for timing wifi scans int _cpclosedelay = 2000; // delay before wifisave, prevents captive portal from closing to fast. bool _cleanConnect = false; // disconnect before connect in connectwifi, increases stability on connects - bool _connectOnsave = true; // connect to wifi when saving creds + bool _connectonsave = true; // connect to wifi when saving creds bool _disableSTA = false; // disable sta when starting ap, always bool _disableSTAConn = true; // disable sta when starting ap, if sta is not connected ( stability ) bool _channelSync = false; // use same wifi sta channel when starting ap