From 3fdf53bf068e7b695fffce17de0eb6a79e6afe4d Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 15 Nov 2017 11:41:47 -0600 Subject: [PATCH] adding debug for configportalhastimeout --- WiFiManager.cpp | 29 +++++++++++++++++++++++------ WiFiManager.h | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 9485455..298b773 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -201,17 +201,32 @@ void WiFiManager::startWebPortal() { void WiFiManager::stopWebPortal() { if(!configPortalActive && !webPortalActive) return; - DEBUG_WM("Stopping Web Portal"); + DEBUG_WM(F("Stopping Web Portal")); webPortalActive = false; stopConfigPortal(); } boolean WiFiManager::configPortalHasTimeout(){ if(_configPortalTimeout == 0 || wifi_softap_get_station_num() > 0){ + if(millis() - timer > 10000){ + timer = millis(); + DEBUG_WM("NUM CLIENTS: " + (String)wifi_softap_get_station_num()); + } _configPortalStart = millis(); // kludge, bump configportal start time to skew timeouts return false; } - return (millis() > _configPortalStart + _configPortalTimeout); + + if(millis() > _configPortalStart + _configPortalTimeout){ + DEBUG_WM(F("config portal has timed out")); + return true; + } else { + if((millis() - timer) > 10000){ + timer = millis(); + DEBUG_WM("Portal Timeout In " + (String)((_configPortalStart + _configPortalTimeout-millis())/1000) + " seconds"); + } + } + + return false; } void WiFiManager::setupConfigPortal() { @@ -295,14 +310,16 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo while(1){ if(reset){ - stopConfigPortal(); - if(!ESP_eraseConfig()) DEBUG_WM(F("ERASE FAILED")); - delay(2000); - break; + DEBUG_WM(F("configportal reset")); + stopConfigPortal(); + if(!ESP_eraseConfig()) DEBUG_WM(F("ERASE FAILED")); + delay(2000); + break; } // if timed out or abort, break if(configPortalHasTimeout() || abort){ + DEBUG_WM(F("configportal abort")); stopConfigPortal(); result = abort ? portalAbortResult : portalTimeoutResult; // false, false break; diff --git a/WiFiManager.h b/WiFiManager.h index 310511d..f122cc92 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -253,6 +253,7 @@ class WiFiManager boolean portalTimeoutResult = false; boolean portalAbortResult = false; boolean storeSTAmode = true; // option store persistent STA mode in connectwifi + int timer = 0; void (*_apcallback)(WiFiManager*) = NULL; void (*_savecallback)(void) = NULL;