From 30efa2e028b3afd9967fc91a9eca75a2589310ea Mon Sep 17 00:00:00 2001 From: tablatronix <807787+tablatronix@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:11:15 -0500 Subject: [PATCH] add esp model and wifi mode status to info page headers --- WiFiManager.cpp | 13 +++++++++---- strings_en.h | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 53f2149..f6d7417 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -2052,9 +2052,14 @@ void WiFiManager::handleInfo() { String WiFiManager::getInfoData(String id){ String p; - // @todo add WM versioning - if(id==F("esphead"))p = FPSTR(HTTP_INFO_esphead); - else if(id==F("wifihead"))p = FPSTR(HTTP_INFO_wifihead); + if(id==F("esphead")){ + p = FPSTR(HTTP_INFO_esphead); + p.replace(FPSTR(T_1),(String)ESP.getChipModel()); + } + else if(id==F("wifihead")){ + p = FPSTR(HTTP_INFO_wifihead); + p.replace(FPSTR(T_1),getModeString(WiFi.getMode())); + } else if(id==F("uptime")){ // subject to rollover! p = FPSTR(HTTP_INFO_uptime); @@ -2107,7 +2112,7 @@ String WiFiManager::getInfoData(String id){ p = FPSTR(HTTP_INFO_bootver); p.replace(FPSTR(T_1),(String)system_get_boot_version()); } - #endif + #endif else if(id==F("cpufreq")){ p = FPSTR(HTTP_INFO_cpufreq); p.replace(FPSTR(T_1),(String)ESP.getCpuFreqMHz()); diff --git a/strings_en.h b/strings_en.h index 25916dc..5ea622e 100644 --- a/strings_en.h +++ b/strings_en.h @@ -173,7 +173,7 @@ const char HTTP_JS[] PROGMEM = // Info html // @todo remove html elements from progmem, repetetive strings #ifdef ESP32 - const char HTTP_INFO_esphead[] PROGMEM = "