From cfb0d2bc5f98ed489d9ef6644897694ae569aa47 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Thu, 1 Feb 2018 08:51:08 -0600 Subject: [PATCH] doh... --- WiFiManager.cpp | 20 ++++++++++---------- WiFiManager.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index dfcafed..416e126 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -87,14 +87,14 @@ bool WiFiManager::addParameter(WiFiManagerParameter *p) { } } - if(_paramsIdx == _max_params){ + if(_paramsCount == _max_params){ // resize the params array by increment of WIFI_MANAGER_MAX_PARAMS _max_params += WIFI_MANAGER_MAX_PARAMS; DEBUG_WM(F("Updated _max_params:"),_max_params); WiFiManagerParameter** new_params = (WiFiManagerParameter**)realloc(_params, _max_params * sizeof(WiFiManagerParameter*)); - // DEBUG_WM(WIFI_MANAGER_MAX_PARAMS); - // DEBUG_WM(_paramsIdx); - // DEBUG_WM(_max_params); + DEBUG_WM(WIFI_MANAGER_MAX_PARAMS); + DEBUG_WM(_paramsCount); + DEBUG_WM(_max_params); if (new_params != NULL) { _params = new_params; } else { @@ -102,8 +102,8 @@ bool WiFiManager::addParameter(WiFiManagerParameter *p) { return false; } } - _params[_paramsIdx] = p; - _paramsIdx++; + _params[_paramsCount] = p; + _paramsCount++; DEBUG_WM("Added Parameter:",p->getID()); return true; } @@ -763,7 +763,7 @@ String WiFiManager::getStaticOut(){ String WiFiManager::getParamOut(){ String page; - if(_paramsIdx > 0){ + if(_paramsCount > 0){ String HTTP_PARAM_temp = FPSTR(HTTP_FORM_LABEL); HTTP_PARAM_temp += FPSTR(HTTP_FORM_PARAM); @@ -780,7 +780,7 @@ String WiFiManager::getParamOut(){ char parLength[5]; // add the extra parameters to the form - for (int i = 0; i < _paramsIdx; i++) { + for (int i = 0; i < _paramsCount; i++) { if (_params[i] == NULL) { break; } @@ -840,10 +840,10 @@ void WiFiManager::handleWifiSave() { _pass = server->arg("p").c_str(); //parameters - if(_paramsIdx > 0){ + if(_paramsCount > 0){ DEBUG_WM("Parameters"); DEBUG_WM("-----------"); - for (int i = 0; i < _paramsIdx; i++) { + for (int i = 0; i < _paramsCount; i++) { if (_params[i] == NULL) { break; } diff --git a/WiFiManager.h b/WiFiManager.h index 37cf9ef..d0b90be 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -229,7 +229,7 @@ class WiFiManager int timer = 0; // WiFiManagerParameter - int _paramsIdx = 0; + int _paramsCount = 0; int _max_params; WiFiManagerParameter** _params;