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)