From 8e28011f13b5973bc38b0a0b9e22552a6b2c2c89 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Mon, 12 Feb 2018 10:57:59 -0600 Subject: [PATCH 1/2] fix some html bugs --- strings_en.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strings_en.h b/strings_en.h index dcc13c9..002323a 100644 --- a/strings_en.h +++ b/strings_en.h @@ -42,7 +42,7 @@ const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_HELP[] PROGMEM = @@ -95,8 +95,8 @@ const char HTTP_JS[] PROGMEM = const char HTTP_INFO_esphead[] PROGMEM = "

esp8266


"; const char HTTP_INFO_wifihead[] PROGMEM = "

WiFi


"; -const char HTTP_INFO_uptime[] PROGMEM = "
Uptime
{1} Mins {2} Secs
"; -const char HTTP_INFO_chipid[] PROGMEM = "
Chip ID
{1}
"; +const char HTTP_INFO_uptime[] PROGMEM = "
Uptime
{1} Mins {2} Secs
"; +const char HTTP_INFO_chipid[] PROGMEM = "
Chip ID
{1}
"; const char HTTP_INFO_fchipid[] PROGMEM = "
Flash Chip ID
{1}
"; const char HTTP_INFO_idesize[] PROGMEM = "
IDE Flash Size
{1} bytes
"; const char HTTP_INFO_flashsize[] PROGMEM = "
Actual Flash Size
{1} bytes
"; From 46929e0ee6e7df7ab1b5d6ff81eeee9399fb77df Mon Sep 17 00:00:00 2001 From: Shawn A Date: Mon, 12 Feb 2018 10:59:50 -0600 Subject: [PATCH 2/2] change uptime --- WiFiManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 3034a9d..4ee0e90 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -971,8 +971,8 @@ String WiFiManager::getInfoData(String id){ else if(id=="uptime"){ // subject to rollover! p = FPSTR(HTTP_INFO_uptime); - p.replace("{1}",(String)(system_get_time() / 1000000 / 60)); - p.replace("{2}",(String)((system_get_time() / 1000000)%60)); + p.replace("{1}",(String)(millis() / 1000 / 60)); + p.replace("{2}",(String)((millis() / 1000)%60)); } else if(id=="chipid"){ p = FPSTR(HTTP_INFO_chipid);