github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-28 12:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-v2.1.0

Browse Source
This commit is contained in:
Gunnar Skjold
2022-03-11 19:48:20 +01:00
parent 3948fff184 55bdd4437a
commit b6b9db5431
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/application.js
View File

@@ -735,28 +735,28 @@ var fetch = function() {
ao.title = 'Phase current'; ao.title = 'Phase current';
break; break;
} }
var a = 0; var dA = false;
var r = 1; var r = 1;
var arr = [['Phase', 'Amperage', { role: 'style' }, { role: 'annotation' }]]; var arr = [['Phase', 'Amperage', { role: 'style' }, { role: 'annotation' }]];
if(json.i1 || json.u1) { if(json.i1 || json.u1) {
var i1 = parseFloat(json.i1); var i1 = parseFloat(json.i1);
a = Math.max(a, i1); dA = true;
var pct = (parseFloat(json.i1)/parseInt(json.mf))*100; var pct = (parseFloat(json.i1)/parseInt(json.mf))*100;
arr[r++] = ['L1', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i1 + "A"]; arr[r++] = ['L1', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i1 + "A"];
} }
if(json.i2 || json.u2) { if(json.i2 || json.u2) {
var i2 = parseFloat(json.i2); var i2 = parseFloat(json.i2);
a = Math.max(a, i2); dA = true;
var pct = (parseFloat(json.i2)/parseInt(json.mf))*100; var pct = (parseFloat(json.i2)/parseInt(json.mf))*100;
arr[r++] = ['L2', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i2 + "A"]; arr[r++] = ['L2', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i2 + "A"];
} }
if(json.i3 || json.u3) { if(json.i3 || json.u3) {
var i3 = parseFloat(json.i3); var i3 = parseFloat(json.i3);
a = Math.max(a, i3); dA = true;
var pct = (parseFloat(json.i3)/parseInt(json.mf))*100; var pct = (parseFloat(json.i3)/parseInt(json.mf))*100;
arr[r++] = ['L3', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i3 + "A"]; arr[r++] = ['L3', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i3 + "A"];
} }
if(a > 0) { if(dA) {
aa = google.visualization.arrayToDataTable(arr); aa = google.visualization.arrayToDataTable(arr);
ap.draw(aa, ao); ap.draw(aa, ao);
} }