From 2f7a8c973d6fcd184cb829ba7aeaae4a6f5e708c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Mu=CC=88ller?= Date: Sun, 12 Feb 2023 20:06:09 +0100 Subject: [PATCH 1/5] minor output fixes --- src/ESP_WiFiManager_Lite.h | 15 ++++++++------- src/ESP_WiFiManager_Lite_Debug.h | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/ESP_WiFiManager_Lite.h b/src/ESP_WiFiManager_Lite.h index 2b9492b..255c971 100644 --- a/src/ESP_WiFiManager_Lite.h +++ b/src/ESP_WiFiManager_Lite.h @@ -1434,11 +1434,16 @@ class ESP_WiFiManager_Lite void displayConfigData(const ESP_WM_LITE_Configuration& configData) { - ESP_WML_LOGERROR5(F("Hdr="), configData.header, F(",SSID="), configData.WiFi_Creds[0].wifi_ssid, - F(",PW="), configData.WiFi_Creds[0].wifi_pw); - ESP_WML_LOGERROR3(F("SSID1="), configData.WiFi_Creds[1].wifi_ssid, F(",PW1="), configData.WiFi_Creds[1].wifi_pw); + ESP_WML_LOGERROR1(F("Hdr="), configData.header); + ESP_WML_LOGERROR3(F("SSID0="), configData.WiFi_Creds[0].wifi_ssid, F(",PW0="), configData.WiFi_Creds[0].wifi_pw); + ESP_WML_LOGERROR3(F("SSID1="), configData.WiFi_Creds[1].wifi_ssid, F(",PW1="), configData.WiFi_Creds[1].wifi_pw); + +#if USING_BOARD_NAME + ESP_WML_LOGERROR1(F("BName="), configData.board_name); +#endif + #if USE_DYNAMIC_PARAMETERS for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) @@ -2141,10 +2146,6 @@ class ESP_WiFiManager_Lite // If SSID, PW ="blank" or NULL, stay in config mode forever until having config Data. return false; } - else - { - displayConfigData(ESP_WM_LITE_config); - } return true; } diff --git a/src/ESP_WiFiManager_Lite_Debug.h b/src/ESP_WiFiManager_Lite_Debug.h index c765b64..1246950 100644 --- a/src/ESP_WiFiManager_Lite_Debug.h +++ b/src/ESP_WiFiManager_Lite_Debug.h @@ -76,8 +76,8 @@ const char ESP_WML_MARK[] = "[WML] "; #define ESP_WML_LOGINFO0(x) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT(x); } #define ESP_WML_LOGINFO(x) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT_MARK; ESP_WML_PRINTLN(x); } #define ESP_WML_LOGINFO1(x,y) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINTLN(y); } -#define ESP_WML_LOGINFO2(x,y,z) if(_ESP_WM_LITE_LOGLEVEL_>3) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINT(y); ESP_WML_PRINTLN(z); } -#define ESP_WML_LOGINFO3(x,y,z,w) if(_ESP_WM_LITE_LOGLEVEL_>3) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINT(y); ESP_WML_PRINT(z); ESP_WML_PRINTLN(w); } +#define ESP_WML_LOGINFO2(x,y,z) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINT(y); ESP_WML_PRINTLN(z); } +#define ESP_WML_LOGINFO3(x,y,z,w) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINT(y); ESP_WML_PRINT(z); ESP_WML_PRINTLN(w); } #define ESP_WML_LOGINFO5(x,y,z,w,xx,yy) if(_ESP_WM_LITE_LOGLEVEL_>2) { ESP_WML_PRINT_MARK; ESP_WML_PRINT(x); ESP_WML_PRINT(y); ESP_WML_PRINT(z); ESP_WML_PRINT(w); ESP_WML_PRINT(xx); ESP_WML_PRINTLN(yy); } /////////////////////////////////////////// From 7a4283d9c09fb46c2d94302996504b0b5e3d822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Mu=CC=88ller?= Date: Mon, 27 Feb 2023 16:42:27 +0100 Subject: [PATCH 2/5] added Apple .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8604b38..f42c7da 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ *.app .vscode/ +.DS_Store From 33f2c24228569c8a26e2f1da5dd264c6d3e514ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Mu=CC=88ller?= Date: Mon, 27 Feb 2023 16:49:48 +0100 Subject: [PATCH 3/5] reserve String space to avoid bad memory re-allocating --- src/ESP_WiFiManager_Lite.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ESP_WiFiManager_Lite.h b/src/ESP_WiFiManager_Lite.h index 33763a2..951dfc9 100644 --- a/src/ESP_WiFiManager_Lite.h +++ b/src/ESP_WiFiManager_Lite.h @@ -2664,6 +2664,7 @@ class ESP_WiFiManager_Lite void createHTML(String& root_html_template) { String pitem; + pitem.reserve(600); root_html_template = FPSTR(ESP_WM_LITE_HTML_HEAD_START); @@ -2805,6 +2806,7 @@ class ESP_WiFiManager_Lite ////// String result; + result.reserve(3072); createHTML(result); //ESP_WML_LOGDEBUG1(F("h:Repl:"), result); From c3357a2c429c0a9c9a933087fefcadb04dd57156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Mu=CC=88ller?= Date: Sun, 12 Mar 2023 10:47:37 +0100 Subject: [PATCH 4/5] remove String() from assigning a new pitem (otherwise reserved size gets resetted) --- src/ESP_WiFiManager_Lite.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ESP_WiFiManager_Lite.h b/src/ESP_WiFiManager_Lite.h index 951dfc9..83d5f9c 100644 --- a/src/ESP_WiFiManager_Lite.h +++ b/src/ESP_WiFiManager_Lite.h @@ -2708,7 +2708,7 @@ class ESP_WiFiManager_Lite if (ListOfSSIDs == "") // No SSID found or none was good enough ListOfSSIDs = String(FPSTR(ESP_WM_LITE_OPTION_START)) + String(FPSTR(ESP_WM_LITE_NO_NETWORKS_FOUND)) + String(FPSTR(ESP_WM_LITE_OPTION_END)); - pitem = String(FPSTR(ESP_WM_LITE_HTML_HEAD_END)); + pitem = FPSTR(ESP_WM_LITE_HTML_HEAD_END); #if MANUAL_SSID_INPUT_ALLOWED pitem.replace("[[input_id]]", "" + String(FPSTR(ESP_WM_LITE_DATALIST_START)) + "'SSIDs'>" + @@ -2726,7 +2726,7 @@ class ESP_WiFiManager_Lite #else - pitem = String(FPSTR(ESP_WM_LITE_HTML_HEAD_END)); + pitem = FPSTR(ESP_WM_LITE_HTML_HEAD_END); pitem.replace("[[input_id]]", FPSTR(ESP_WM_LITE_HTML_INPUT_ID)); pitem.replace("[[input_id1]]", FPSTR(ESP_WM_LITE_HTML_INPUT_ID1)); root_html_template += pitem + FPSTR(ESP_WM_LITE_FLDSET_START); @@ -2737,7 +2737,7 @@ class ESP_WiFiManager_Lite for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) { - pitem = String(FPSTR(ESP_WM_LITE_HTML_PARAM)); + pitem = FPSTR(ESP_WM_LITE_HTML_PARAM); pitem.replace("{b}", myMenuItems[i].displayName); pitem.replace("{v}", myMenuItems[i].id); @@ -2754,7 +2754,7 @@ class ESP_WiFiManager_Lite for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) { - pitem = String(FPSTR(ESP_WM_LITE_HTML_SCRIPT_ITEM)); + pitem = FPSTR(ESP_WM_LITE_HTML_SCRIPT_ITEM); pitem.replace("{d}", myMenuItems[i].id); From f80bbbaf9a9d7dcc590f1d8ee451b789f4c2a800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Mu=CC=88ller?= Date: Thu, 16 Mar 2023 20:45:21 +0100 Subject: [PATCH 5/5] corrected comment --- src/ESP_WiFiManager_Lite_Debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ESP_WiFiManager_Lite_Debug.h b/src/ESP_WiFiManager_Lite_Debug.h index 3a75f8f..d7aa495 100644 --- a/src/ESP_WiFiManager_Lite_Debug.h +++ b/src/ESP_WiFiManager_Lite_Debug.h @@ -36,10 +36,10 @@ #endif // Change _ESP_WM_LITE_LOGLEVEL_ to set tracing and logging verbosity -// 0: DISABLED: no logging +// 0: DISABLED: no logging (default) // 1: ERROR: errors // 2: WARN: errors and warnings -// 3: INFO: errors, warnings and informational (default) +// 3: INFO: errors, warnings and informational // 4: DEBUG: errors, warnings, informational and debug #ifndef _ESP_WM_LITE_LOGLEVEL_