3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-04-29 18:26:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'GHolli-main' into development03

Browse source
This commit is contained in:
lumapu 2023-08-04 18:37:07 +02:00
commit fc32ba38a4
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
User_Manual.md
View file

@ -65,7 +65,7 @@ The AhoyDTU will publish on the following topics
|Q_AC | 21.200| actual AC reactive power in var| |Q_AC | 21.200| actual AC reactive power in var|
|F_AC | 49.990| actual AC Frequency in Hz| |F_AC | 49.990| actual AC Frequency in Hz|
|PF_AC | 95.800| actual AC Power factor| |PF_AC | 95.800| actual AC Power factor|
|Temp | 19.800|Temperature of inverter in Celsius| |Temp | 19.800|Temperature of inverter in degree Celsius|
|EVT | 9.000|Last Event/Alarm Message Index| |EVT | 9.000|Last Event/Alarm Message Index|
|YieldDay | 51.000|Energy converted to AC per day in Watt hours (measured on DC)| |YieldDay | 51.000|Energy converted to AC per day in Watt hours (measured on DC)|
|YieldTotal | 465.294|Energy converted to AC since reset Watt hours (measured on DC)| |YieldTotal | 465.294|Energy converted to AC since reset Watt hours (measured on DC)|

3
src/web/html/api.js
View file

@ -52,8 +52,7 @@ function ml(tagName, ...args) {
function nester(el, n) { function nester(el, n) {
if (typeof n === "string") { if (typeof n === "string") {
var t = document.createTextNode(n); el.innerHTML = n;
el.appendChild(t);
} else if (n instanceof Array) { } else if (n instanceof Array) {
for(var i = 0; i < n.length; i++) { for(var i = 0; i < n.length; i++) {
if (typeof n[i] === "string") { if (typeof n[i] === "string") {

6
src/web/html/visualization.html
View file

@ -92,14 +92,14 @@
total[2] += obj.ch[0][6]; // YieldTotal total[2] += obj.ch[0][6]; // YieldTotal
total[3] += obj.ch[0][8]; // P_DC total[3] += obj.ch[0][8]; // P_DC
total[4] += obj.ch[0][10]; // Q_AC total[4] += obj.ch[0][10]; // Q_AC
var t = span(" &deg; C"); var t = span("&nbsp;&deg;C");
return ml("div", {class: "row mt-2"}, return ml("div", {class: "row mt-2"},
ml("div", {class: "col"}, [ ml("div", {class: "col"}, [
ml("div", {class: "p-2 iv-h"}, ml("div", {class: "p-2 iv-h"},
ml("div", {class: "row"}, [ ml("div", {class: "row"}, [
ml("div", {class: "col mx-2 mx-md-1"}, obj.name), ml("div", {class: "col mx-2 mx-md-1"}, obj.name),
ml("div", {class: "col a-c"}, "Power limit " + ((obj.power_limit_read == 65535) ? "n/a" : (obj.power_limit_read + " %"))), ml("div", {class: "col a-c"}, "Power limit " + ((obj.power_limit_read == 65535) ? "n/a" : (obj.power_limit_read + "&nbsp;%"))),
ml("div", {class: "col a-r mx-2 mx-md-1"}, String(obj.ch[0][5]) + t.innerHTML) ml("div", {class: "col a-r mx-2 mx-md-1"}, String(obj.ch[0][5]) + t.innerText)
]) ])
), ),
ml("div", {class: "p-2 iv-bg"}, [ ml("div", {class: "p-2 iv-bg"}, [