From a319baa743b149d0c9a99a8603cc7b6460cbdb6a Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:25:45 +0100 Subject: [PATCH 1/7] Create mn0.html Monitor page --- src/base/data/mn0.html | 477 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 477 insertions(+) create mode 100644 src/base/data/mn0.html diff --git a/src/base/data/mn0.html b/src/base/data/mn0.html new file mode 100644 index 0000000..c0cb956 --- /dev/null +++ b/src/base/data/mn0.html @@ -0,0 +1,477 @@ + +Loading... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
STATUS 🚦Stove Status
LSTATUS 🚦Stove Status
PWR ⚡Power + + +
SETP 🌡Setpoint + +
T1 🌡️Ambiant Temperature (T1)
T2 🌡️Pellets Temperature (T2)
T3 🌡️Fumes Temperature (T3)
T4 🌡️
T5 🌡️
F1RPM 💨Exhaust Fan RPM
F1V 💨Exhaust Fan V
F2L 💨Room Fan Level + +
F2V 💨Room Fan V
F2LF 💨
IGN 💥Number of ignitions
IGNERRORS ⚠️Ignition Errors
OVERTMPERRORS ⚠️Overtemperature Errors
POWERTIME ⌛Power Time
HEATTIME ⌛Heat Time
SERVICETIME ⌛Service time
ONTIME ⌛ON Time
PQT 🥜Quantity of Pellet
STOVE_DATETIME 📅Stove Datetime +
STOVE_WDAY 📅Stove Week Day
FDR 🚀Feeder
DP_TARGET 🎯Target Pressure
DP_PRESS 📈Delta Pressure
+
+ +
+
+ From d331d7e79b31e3cb06640850485df92f9dba5abd Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:26:21 +0100 Subject: [PATCH 2/7] Update index.html Add monitor page --- src/base/data/index.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/base/data/index.html b/src/base/data/index.html index f1af9a0..c19213e 100644 --- a/src/base/data/index.html +++ b/src/base/data/index.html @@ -48,6 +48,7 @@ class="pure-menu-link">Status + @@ -155,11 +156,11 @@

el.dispatchEvent(evt); } - function emptyContents() { $("#menuStatus").classList.remove("pure-menu-selected"); $("#menuConfig").classList.remove("pure-menu-selected"); $("#menuFirmware").classList.remove("pure-menu-selected"); + $("#menuMonitor").classList.remove("pure-menu-selected"); $("#menuDiscover").classList.remove("pure-menu-selected"); $("#content0").innerHTML = ''; @@ -213,6 +214,14 @@

load($("#content0"), "/fw0.html"); }); + $("#menuMonitor").addEventListener("click", function (evt) { + evt.preventDefault(); + emptyContents(); + $("#menuMonitor").classList.add("pure-menu-selected"); + $("#mainHeader").textContent = "Monitor"; + load($("#content0"), "/mn0.html"); + }); + $("#menuDiscover").addEventListener("click", function (evt) { evt.preventDefault(); emptyContents(); @@ -223,4 +232,4 @@

- \ No newline at end of file + From 069071e72fe2893ec0e46426a98a83b917d0691f Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:26:46 +0100 Subject: [PATCH 3/7] Update Application.cpp Add monitor page --- src/base/Application.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/base/Application.cpp b/src/base/Application.cpp index cb67814..f05e996 100644 --- a/src/base/Application.cpp +++ b/src/base/Application.cpp @@ -192,6 +192,14 @@ void Application::initWebServer(ESP8266WebServer &server, bool &shouldReboot, bo server.sendHeader(F("Content-Encoding"), F("gzip")); server.send_P(200, PSTR("text/html"), getHTMLContent(fw), getHTMLContentSize(fw)); }); + // HTML mn handler + sprintf_P(url, PSTR("/mn%c.html"), _appId); + server.on(url, HTTP_GET, [this, &server]() + { + server.keepAlive(false); + server.sendHeader(F("Content-Encoding"), F("gzip")); + server.send_P(200, PSTR("text/html"), getHTMLContent(mn), getHTMLContentSize(mn)); }); + // HTML discover handler sprintf_P(url, PSTR("/discover%c.html"), _appId); server.on(url, HTTP_GET, [this, &server]() @@ -288,4 +296,4 @@ void Application::run() #endif appRun(); -} \ No newline at end of file +} From 2221299cdce1ade00680eb4f8064ef3269d5751d Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:27:04 +0100 Subject: [PATCH 4/7] Add monitor page --- src/base/Application.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/base/Application.h b/src/base/Application.h index 4edb497..07fa2a5 100644 --- a/src/base/Application.h +++ b/src/base/Application.h @@ -19,6 +19,7 @@ class Application status, config, fw, + mn, discover } WebPageForPlaceHolder; @@ -70,4 +71,4 @@ class Application void run(); }; -#endif \ No newline at end of file +#endif From e1eb3c3957f4554c79d2c2badc44f0eeaf58c1d3 Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:27:27 +0100 Subject: [PATCH 5/7] Update Core.cpp Add monitor page --- src/base/Core.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/base/Core.cpp b/src/base/Core.cpp index 0b3593b..d6409b9 100644 --- a/src/base/Core.cpp +++ b/src/base/Core.cpp @@ -51,6 +51,9 @@ const PROGMEM char *Core::getHTMLContent(WebPageForPlaceHolder wp) case fw: return fw0htmlgz; break; + case mn: + return mn0htmlgz; + break; case discover: return discover0htmlgz; break; @@ -70,6 +73,9 @@ size_t Core::getHTMLContentSize(WebPageForPlaceHolder wp) case fw: return sizeof(fw0htmlgz); break; + case mn: + return sizeof(mn0htmlgz); + break; case discover: return sizeof(discover0htmlgz); break; @@ -278,4 +284,4 @@ void Core::appInitWebServer(ESP8266WebServer &server, bool &shouldReboot, bool & { server.keepAlive(false); server.send(404); }); -} \ No newline at end of file +} From 7df779d8406dd82b5908187989bf2d032b4c3232 Mon Sep 17 00:00:00 2001 From: Flobul Date: Sat, 27 Jan 2024 11:27:43 +0100 Subject: [PATCH 6/7] Update Core.h Add monitor page --- src/base/Core.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/base/Core.h b/src/base/Core.h index 1d8d030..42ba44a 100644 --- a/src/base/Core.h +++ b/src/base/Core.h @@ -10,6 +10,7 @@ #include "data/status0.html.gz.h" #include "data/config0.html.gz.h" #include "data/fw0.html.gz.h" +#include "data/mn0.html.gz.h" #include "data/discover0.html.gz.h" class Core : public Application @@ -30,4 +31,4 @@ class Core : public Application Core(char appId, String fileName) : Application(appId, fileName) {} }; -#endif \ No newline at end of file +#endif From 0554e8add40beaa39fa641e2e6967e116a4b7ef8 Mon Sep 17 00:00:00 2001 From: Flobul Date: Sun, 28 Jan 2024 10:30:54 +0100 Subject: [PATCH 7/7] Hide name cmd on small screen device --- src/base/data/mn0.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/base/data/mn0.html b/src/base/data/mn0.html index c0cb956..8846f53 100644 --- a/src/base/data/mn0.html +++ b/src/base/data/mn0.html @@ -8,7 +8,12 @@ .redfont { color:red; } .greenfont { color:green; } .inputResult { margin-left: 5px; width: 60px; } - .textareaResponse { border: 1px solid #ccc; padding: 1px 6px; display: block; width: 80%; overflow: hidden; resize: both; min-height: 40px; line-height: 20px; } + .textareaResponse { border: 1px solid #ccc; padding: 1px 6px; display: block; overflow: hidden; resize: both; min-height: 40px; line-height: 20px; } + @media (max-width: 48em) { + #liveData tr .name { + display: none; + } + } Loading... @@ -40,7 +45,7 @@ @@ -83,7 +88,7 @@ + + @@ -285,6 +294,7 @@ switch (k) { case "STATUS": $(qsp + '#' + k + ' #ONOFFCMD').value = (liveData[k] != 6 ? 'OFF' : 'ON'); + liveData[k] = statusCode[liveData[k]]; break; case "PWR": @@ -389,7 +399,7 @@ sendCmd('SET+STPD'); }); $(qsp + '#STPUCMD').addEventListener("click", function (evt) { - $(qsp + '#SETP .value').innerText = parseInt($(qsp + '#SETP .value').innerText) + 1+ ' ' + $(qsp + '#SETP .value').getAttribute('data-unit'); + $(qsp + '#SETP .value').innerText = parseInt($(qsp + '#SETP .value').innerText) + 1 + ' ' + $(qsp + '#SETP .value').getAttribute('data-unit'); sendCmd('SET+STPU'); });
Setpoint - +
Room Fan Level - @@ -105,6 +110,10 @@
IGN 💥 Number of ignitions