From 18cb6af0e478585b9edabdcc6498ee47057c0485 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 14 Feb 2018 22:43:55 -0600 Subject: [PATCH 1/4] dup define --- WiFiManager.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/WiFiManager.h b/WiFiManager.h index 0195781..05ccd60 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -50,18 +50,8 @@ #include #include - -#if defined(ESP8266) - extern "C" { - #include "user_interface.h" - } -#endif - #include "strings_en.h" -#define WIFI_getChipId() ESP.getChipId() -#define WIFI_AUTH_OPEN ENC_TYPE_NONE - #ifndef WIFI_MANAGER_MAX_PARAMS #define WIFI_MANAGER_MAX_PARAMS 5 // params will autoincrement and realloc by this amount when max is reached #endif From 9da297f4059291f2f03725d81958823e627700a4 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 14 Feb 2018 23:03:14 -0600 Subject: [PATCH 2/4] moved _wifissidprefix to progmem --- WiFiManager.h | 8 +------- strings_en.h | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/WiFiManager.h b/WiFiManager.h index 05ccd60..829ed6d 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -198,13 +198,7 @@ class WiFiManager unsigned long _webPortalAccessed = 0; WiFiMode_t _usermode = WIFI_OFF; - #ifdef ESP8266 - String _wifissidprefix = "ESP"; - #elif defined(ESP32) - String _wifissidprefix = "ESP32"; - #else - String _wifissidprefix = "WM"; - #endif + String _wifissidprefix = FPSTR(S_ssidpre); // option parameters int _minimumQuality = -1; diff --git a/strings_en.h b/strings_en.h index 344c862..ba80113 100644 --- a/strings_en.h +++ b/strings_en.h @@ -173,6 +173,14 @@ const char S_ip[] PROGMEM = "ip"; const char S_gw[] PROGMEM = "gw"; const char S_sn[] PROGMEM = "sn"; +#ifdef ESP8266 + const char S_ssidpre[] PROGMEM = "ESP"; +#elif defined(ESP32) + const char S_ssidpre[] PROGMEM = "ESP32"; +#else + const char S_ssidpre[] PROGMEM = "WM"; +#endif + //Tokens //@todo consolidate and reduce const char T_1[] PROGMEM = "{1}"; // @token 1 From 3e66273c3eb7e6c29ba4c7fb98b48713b3bac0e9 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 14 Feb 2018 23:08:59 -0600 Subject: [PATCH 3/4] esp32 strings progmem --- WiFiManager.cpp | 47 ++++++++++++++++++++++++----------------------- strings_en.h | 1 + 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index a540f89..f105a43 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -1011,16 +1011,16 @@ String WiFiManager::getInfoData(String id){ p = FPSTR(HTTP_INFO_chipid); p.replace(FPSTR(T_1),(String)WIFI_getChipId()); } - else if(id=="chiprev"){ + else if(id==F("chiprev")){ #ifdef ESP32 p = FPSTR(HTTP_INFO_chiprev); - p.replace("{1}",(String)ESP.getChipRevision()); + p.replace(FPSTR(T_1),(String)ESP.getChipRevision()); #endif } - else if(id=="fchipid"){ + else if(id==F("fchipid")){ #ifdef ESP8266 p = FPSTR(HTTP_INFO_fchipid); - p.replace("{1}",(String)ESP.getFlashChipId()); + p.replace(FPSTR(T_1),(String)ESP.getFlashChipId()); #endif } else if(id==F("idesize")){ @@ -1036,7 +1036,7 @@ String WiFiManager::getInfoData(String id){ else if(id==F("sdkver")){ p = FPSTR(HTTP_INFO_sdkver); #ifdef ESP32 - p.replace("{1}",(String)esp_get_idf_version()); + p.replace(FPSTR(T_1),(String)esp_get_idf_version()); #else p.replace(FPSTR(T_1),(String)system_get_sdk_version()); #endif @@ -1078,7 +1078,7 @@ String WiFiManager::getInfoData(String id){ else if(id==F("lastreset")){ #ifdef ESP8266 p = FPSTR(HTTP_INFO_lastreset); - p.replace("{1}",(String)ESP.getResetReason()); + p.replace(FPSTR(T_1),(String)ESP.getResetReason()); #elif defined(ESP32) && defined(_ROM_RTC_H_) // requires #include p = FPSTR(HTTP_INFO_lastreset); @@ -1087,22 +1087,23 @@ String WiFiManager::getInfoData(String id){ String tok = "{"+(String)(i+1)+"}"; switch (reason) { - case 1 : p.replace(tok,"Vbat power on reset");break; - case 3 : p.replace(tok,"Software reset digital core");break; - case 4 : p.replace(tok,"Legacy watch dog reset digital core");break; - case 5 : p.replace(tok,"Deep Sleep reset digital core");break; - case 6 : p.replace(tok,"Reset by SLC module, reset digital core");break; - case 7 : p.replace(tok,"Timer Group0 Watch dog reset digital core");break; - case 8 : p.replace(tok,"Timer Group1 Watch dog reset digital core");break; - case 9 : p.replace(tok,"RTC Watch dog Reset digital core");break; - case 10 : p.replace(tok,"Instrusion tested to reset CPU");break; - case 11 : p.replace(tok,"Time Group reset CPU");break; - case 12 : p.replace(tok,"Software reset CPU");break; - case 13 : p.replace(tok,"RTC Watch dog Reset CPU");break; - case 14 : p.replace(tok,"for APP CPU, reseted by PRO CPU");break; - case 15 : p.replace(tok,"Reset when the vdd voltage is not stable");break; - case 16 : p.replace(tok,"RTC Watch dog reset digital core and rtc module");break; - default : p.replace(tok,"NO_MEAN"); + //@todo move to array + case 1 : p.replace(tok,F("Vbat power on reset"));break; + case 3 : p.replace(tok,F("Software reset digital core"));break; + case 4 : p.replace(tok,F("Legacy watch dog reset digital core"));break; + case 5 : p.replace(tok,F("Deep Sleep reset digital core"));break; + case 6 : p.replace(tok,F("Reset by SLC module, reset digital core"));break; + case 7 : p.replace(tok,F("Timer Group0 Watch dog reset digital core"));break; + case 8 : p.replace(tok,F("Timer Group1 Watch dog reset digital core"));break; + case 9 : p.replace(tok,F("RTC Watch dog Reset digital core"));break; + case 10 : p.replace(tok,F("Instrusion tested to reset CPU"));break; + case 11 : p.replace(tok,F("Time Group reset CPU"));break; + case 12 : p.replace(tok,F("Software reset CPU"));break; + case 13 : p.replace(tok,F("RTC Watch dog Reset CPU"));break; + case 14 : p.replace(tok,F("for APP CPU, reseted by PRO CPU"));break; + case 15 : p.replace(tok,F("Reset when the vdd voltage is not stable"));break; + case 16 : p.replace(tok,F("RTC Watch dog reset digital core and rtc module"));break; + default : p.replace(tok,F("NO_MEAN")); } } #endif @@ -1142,7 +1143,7 @@ String WiFiManager::getInfoData(String id){ else if(id==F("host")){ p = FPSTR(HTTP_INFO_host); #ifdef ESP32 - p.replace("{1}",WiFi.getHostname()); + p.replace(FPSTR(T_1),WiFi.getHostname()); #else p.replace(FPSTR(T_1),WiFi.hostname()); #endif diff --git a/strings_en.h b/strings_en.h index ba80113..fb25a81 100644 --- a/strings_en.h +++ b/strings_en.h @@ -173,6 +173,7 @@ const char S_ip[] PROGMEM = "ip"; const char S_gw[] PROGMEM = "gw"; const char S_sn[] PROGMEM = "sn"; +// softap ssid default prefix #ifdef ESP8266 const char S_ssidpre[] PROGMEM = "ESP"; #elif defined(ESP32) From 8c1e070582f5d1cfe4c927431c8c320b404f3476 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Wed, 14 Feb 2018 23:14:01 -0600 Subject: [PATCH 4/4] strings --- WiFiManager.cpp | 5 +++-- strings_en.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index f105a43..b415cf7 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -911,7 +911,8 @@ void WiFiManager::handleInfo() { String page = getHTTPHead(FPSTR(S_titleinfo)); // @token titleinfo reportStatus(page); - #ifdef ESP8266 + //@todo convert to enum + #ifdef ESP8266 String infoids[] = { F("esphead"), F("uptime"), @@ -1084,7 +1085,7 @@ String WiFiManager::getInfoData(String id){ p = FPSTR(HTTP_INFO_lastreset); for(int i=0;i<2;i++){ int reason = rtc_get_reset_reason(i); - String tok = "{"+(String)(i+1)+"}"; + String tok = (String)T_ss+(String)(i+1)+(String)T_es; switch (reason) { //@todo move to array diff --git a/strings_en.h b/strings_en.h index fb25a81..b75ff9d 100644 --- a/strings_en.h +++ b/strings_en.h @@ -184,6 +184,8 @@ const char S_sn[] PROGMEM = "sn"; //Tokens //@todo consolidate and reduce +const char T_ss[] PROGMEM = "{"; // token start sentinel +const char T_es[] PROGMEM = "}"; // token end sentinel const char T_1[] PROGMEM = "{1}"; // @token 1 const char T_2[] PROGMEM = "{2}"; // @token 2 const char T_v[] PROGMEM = "{v}"; // @token v