From ebed3e0e68bbe50d0bf00db2f1935d133ae325d9 Mon Sep 17 00:00:00 2001 From: steadramon Date: Fri, 14 Apr 2023 20:45:40 +0100 Subject: [PATCH] cleanup --- ESPGeiger/src/ConfigManager/ConfigManager.cpp | 17 ++----- ESPGeiger/src/ConfigManager/html.h | 48 ++----------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/ESPGeiger/src/ConfigManager/ConfigManager.cpp b/ESPGeiger/src/ConfigManager/ConfigManager.cpp index e30826c..874a764 100644 --- a/ESPGeiger/src/ConfigManager/ConfigManager.cpp +++ b/ESPGeiger/src/ConfigManager/ConfigManager.cpp @@ -169,10 +169,8 @@ void ConfigManager::handleJsonReturn() void ConfigManager::handleStatusPage() { String page = FPSTR(HTTP_HEAD_START); - page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += FPSTR(faviconHead); - page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_HEAD_END); page += FPSTR(STATUS_PAGE_BODY); String title = FPSTR(thingName); @@ -191,17 +189,16 @@ void ConfigManager::handleStatusPage() void ConfigManager::handleRestart() { String page = FPSTR(HTTP_HEAD_START); - page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += FPSTR(faviconHead); - page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_HEAD_MREFRESH); page += FPSTR(HTTP_HEAD_END); page += FPSTR(thingName); page += F(" is restarting...

"); - page.replace(FPSTR(T_v), "Restarting..."); + page.replace(FPSTR(T_v), "Restarting ..."); page += FPSTR(HTTP_END); ConfigManager::server->send(200, FPSTR(HTTP_HEAD_CT), page); + Log::console(PSTR("Config: Restarting ... ")); delay(1000); ESP.restart(); } @@ -264,9 +261,6 @@ void ConfigManager::loadParams() { WiFiManagerParameter** customParams = ConfigManager::getParameters(); // Should not be too verbose otherwise it triggers the watchdog reset - //logging::getLogStream().print("wifi: json to load: "); - //serializeJson(jsonBuffer, logging::getLogStream()); - //logging::getLogStream().println(); JsonObject root = jsonBuffer.as(); for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) { @@ -274,9 +268,7 @@ void ConfigManager::loadParams() if (idx != -1) { // Should not be too verbose otherwise it triggers the watchdog reset - //logging::getLogStream().printf("wifi: reading key \"%s\" and value \"%s\"\n", it->key().c_str(), it->value().as()); // Log::console(PSTR("wifi: key \"%s\" with value \"%s\""), it->key().c_str(), it->value().as()); - customParams[idx]->setValue(it->value().as(), customParams[idx]->getValueLength()); } else @@ -301,7 +293,6 @@ void ConfigManager::loadParams() } - void ConfigManager::handleRefreshConsole() { uint32_t counter = 0; @@ -309,7 +300,6 @@ void ConfigManager::handleRefreshConsole() char stmp[8]; String s = server->arg("c1"); strcpy(stmp, s.c_str()); -// strlcpy(stmp, s.c_str(), sizeof(stmp)); if (strlen(stmp)) { counter = atoi(stmp); @@ -399,7 +389,6 @@ void ConfigManager::saveParams() mqtt.disconnect(); } - const char* ConfigManager::getParamValueFromID(const char* str) { WiFiManagerParameter** customParams = ConfigManager::getParameters(); @@ -448,4 +437,4 @@ char* ConfigManager::getUptimeString () { snprintf (strBuffer, sizeof (strBuffer) - 1, "%uT%02d:%02d:%02d", days, hours, minutes, seconds); return strBuffer; -} +} \ No newline at end of file diff --git a/ESPGeiger/src/ConfigManager/html.h b/ESPGeiger/src/ConfigManager/html.h index fecb4a0..fac660c 100644 --- a/ESPGeiger/src/ConfigManager/html.h +++ b/ESPGeiger/src/ConfigManager/html.h @@ -17,17 +17,11 @@ along with this program. If not, see . */ -const char IOTWEBCONF_DASHBOARD_STYLE_INNER[] PROGMEM = "table{margin:20px auto;}h3{text-align:center;}.card{height:12em;margin:10px;text-align:left;font-family:Arial;border:3px groove;border-radius:0.3rem;display:inline-block;padding:10px;min-width:260px;}td{padding:0 10px;}textarea{resize:vertical;width:100%;margin:0;height:318px;padding:5px;overflow:auto;}#c1{width:98%;padding:5px;}#t1{width:98%}.console{display:inline-block;text-align:center;margin:10px 0;width:98%;max-width:1080px;}.G{color:green;}.R{color:red}"; - const char HTTP_HEAD_MREFRESH[] PROGMEM = ""; static const char STATUS_PAGE_BODY[] PROGMEM = R"HTML(

{v}

- - -
+ +
CPM:-
μSv:-
Uptime:-

Console

@@ -37,42 +31,8 @@ static const char STATUS_PAGE_FOOT[] PROGMEM = "
=200&&n.status<400){var o=JSON.parse(n.responseText);byID('uptime').innerHTML=o.uptime;byID('cpm').innerHTML=o.cpm;byID('usv').innerHTML=(o.cpm/o.ratio).toFixed(4);e.update([o.cpm,o.cpm5,o.cpm15]),setTimeout(t,3e3)}},n.onerror=function(){setTimeout(t,6e3)},n.send()}()}(); - -var x=null,lt,to,tp,pc='';var sn=0,id=0; - -function f(){ - var c,o='',t; - clearTimeout(lt); - t = document.getElementById('t1'); - - x=new XMLHttpRequest(); - x.onload = function() { - if(x.status==200){ - var z,d;var a=x.responseText; - id=a.substr(0,a.indexOf('\n')); - z=a.substr(a.indexOf('\n')+1); - if(z.length>0){ - t.value+=z; - } - if (t.scrollTop >= sn) { - t.scrollTop=99999; - sn=t.scrollTop; - } - } - lt=setTimeout(f,3210); - }; - x.onerror = function() { - lt=setTimeout(f,6000); - }; - - x.open('GET','/cs?c1='+id,true); - x.send(); - - return false; -} - -window.addEventListener('load', f); - +var lt,to,tp,x=null,pc="",sn=0,id=0; +function f(){var t;return clearTimeout(lt),t=byID("t1"),(x=new XMLHttpRequest).onload=function(){if(200==x.status){var e,n=x.responseText;id=n.substr(0,n.indexOf("\n")),(e=n.substr(n.indexOf("\n")+1)).length>0&&(t.value+=e),t.scrollTop>=sn&&(t.scrollTop=99999,sn=t.scrollTop)}lt=setTimeout(f,3210)},x.onerror=function(){lt=setTimeout(f,6e3)},x.open("GET","/cs?c1="+id,!0),x.send(),!1}window.addEventListener("load",f); )JS"; // picograph.js - https://github.com/RainingComputers/picograph.js