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

Fixed some bugs from late night coding

Browse Source
This commit is contained in:
Gunnar Skjold 2020-02-16 15:46:01 +01:00
parent ccd818e1ab
commit 00edd94033
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/web/AmsWebServer.cpp
View File

@ -75,6 +75,9 @@ void AmsWebServer::setJson(StaticJsonDocument<1024> json) {
tqo = json["data"]["tQO"].as<double>();
}
} else {
if(po > 0) {
json["data"]["PO"] = po;
}
if(u1 > 0) {
json["data"]["U1"] = u1;
json["data"]["I1"] = i1;

24
web/index.html
View File

@ -228,7 +228,6 @@ var fetch = function() {
$(".SimpleMeter").hide();
cm.show();
pm.show();
var rate = 2500;
for(var id in json) {
var str = json[id];
@ -281,29 +280,32 @@ var fetch = function() {
if(json.data) {
var p = 0;
var p_pct = json.p_pct;
var p_pct = parseInt(json.p_pct);
var p_append = "W";
var po = 0;
var po_pct = json.po_pct;
var po_append = "W";
if(json.data.P) {
p = parseFloat(json.data.P);
if(p > 1000) {
p = (p/1000).toFixed(1);
p_append = "kW";
}
}
cm.gaugeMeter({
percent: 25,
text: p,
append: p_append
});
var po = 0;
var po_pct = parseInt(json.po_pct);
var po_append = "W";
if(json.data.PO) {
po = parseFloat(json.data.PO);
if(po > 1000) {
po = (po/1000).toFixed(1);
po_append = "kW";
}
}
cm.gaugeMeter({
percent: p_pct,
text: p,
append: p_append
});
cm.gaugeMeter({
pm.gaugeMeter({
percent: po_pct,
text: po,
append: po_append