github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-14 07:49:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show phases with power, and always deliver volts and amps to frontend

Browse Source
This commit is contained in:
Gunnar Skjold 2020-01-29 20:38:53 +01:00
parent 36b37eb2a6
commit 378dbbcc99
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/AmsWebServer.cpp
View File

@ -52,11 +52,7 @@ void AmsWebServer::loop() {
}
void AmsWebServer::setJson(StaticJsonDocument<500> json) {
this->json = json;
if(!json.isNull()) {
println(" json has data");
p = json["data"]["P"].as<int>();
if(json["data"].containsKey("U1")) {
u1 = json["data"]["U1"].as<double>();
@ -75,7 +71,21 @@ void AmsWebServer::setJson(StaticJsonDocument<500> json) {
}
}
}
} else {
if(u1 > 0) {
json["data"]["U1"] = u1;
json["data"]["I1"] = i1;
}
if(u2 > 0) {
json["data"]["U2"] = u2;
json["data"]["I2"] = i2;
}
if(u3 > 0) {
json["data"]["U3"] = u3;
json["data"]["I3"] = i3;
}
}
this->json = json;
}
}
@ -116,12 +126,18 @@ void AmsWebServer::indexHtml() {
String html = String((const __FlashStringHelper*) INDEX_HTML);
html.replace("${version}", VERSION);
html.replace("${data.P}", String(p));
html.replace("${data.U1}", String(u1, 1));
html.replace("${data.U2}", String(u2, 1));
html.replace("${data.U3}", String(u3, 1));
html.replace("${data.I1}", String(i1, 1));
html.replace("${data.I2}", String(i2, 1));
html.replace("${data.I3}", String(i3, 1));
html.replace("${data.U1}", u1 > 0 ? String(u1, 1) : "");
html.replace("${data.I1}", u1 > 0 ? String(i1, 1) : "");
html.replace("${display.P1}", u1 > 0 ? "" : "none");
html.replace("${data.U2}", u2 > 0 ? String(u2, 1) : "");
html.replace("${data.I2}", u2 > 0 ? String(i2, 1) : "");
html.replace("${display.P2}", u2 > 0 ? "" : "none");
html.replace("${data.U3}", u3 > 0 ? String(u3, 1) : "");
html.replace("${data.I3}", u3 > 0 ? String(i3, 1) : "");
html.replace("${display.P3}", u3 > 0 ? "" : "none");
server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
server.sendHeader("Pragma", "no-cache");

6
src/index_html.h
View File

@ -45,17 +45,17 @@ const char INDEX_HTML[] PROGMEM = R"=="==(
</div>
</div>
<div class="col-md-4">
<div id="P1" class="row">
<div id="P1" class="row" style="display: ${display.P1}">
<div class="col-2">P1</div>
<div class="col-5 text-right"><span id="U1">${data.U1}</span> V</div>
<div class="col-5 text-right"><span id="I1">${data.I1}</span> A</div>
</div>
<div id="P2" class="row">
<div id="P2" class="row" style="display: ${display.P2}">
<div class="col-2">P2</div>
<div class="col-5 text-right"><span id="U2">${data.U2}</span> V</div>
<div class="col-5 text-right"><span id="I2">${data.I2}</span> A</div>
</div>
<div id="P3" class="row">
<div id="P3" class="row" style="display: ${display.P3}">
<div class="col-2">P3</div>
<div class="col-5 text-right"><span id="U3">${data.U3}</span> V</div>
<div class="col-5 text-right"><span id="I3">${data.I3}</span> A</div>