3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-13 22:47:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed 'polling stop message' on index.html #639

Browse source
This commit is contained in:
lumapu 2023-02-11 02:04:34 +01:00
parent 026df8a09b
commit a843ab6881
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CHANGES.md
View file

@ -9,6 +9,7 @@
* improved zero values on triggers #671 * improved zero values on triggers #671
* hardcoded MQTT subtopics, because wildcard `#` leads to errors * hardcoded MQTT subtopics, because wildcard `#` leads to errors
* rephrased some messages on webif, thx to @Argafal #638 * rephrased some messages on webif, thx to @Argafal #638
* fixed 'polling stop message' on `index.html` #639
## 0.5.84 ## 0.5.84
* fix blue LED lights up all the time #672 * fix blue LED lights up all the time #672

4
src/web/html/index.html
View file

@ -142,12 +142,12 @@
e.addEventListener("click", setTime); e.addEventListener("click", setTime);
} }
if(obj["ts_sunrise"] > 0) { if(obj["disNightComm"]) {
if(((obj["ts_sunrise"] - obj["ts_offset"]) < obj["ts_now"]) if(((obj["ts_sunrise"] - obj["ts_offset"]) < obj["ts_now"])
&& ((obj["ts_sunset"] + obj["ts_offset"]) > obj["ts_now"])) { && ((obj["ts_sunset"] + obj["ts_offset"]) > obj["ts_now"])) {
commInfo = "Polling inverter(s), will stop at sunset " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE')); commInfo = "Polling inverter(s), will stop at sunset " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE'));
} }
else if(obj["disNightComm"]) { else {
commInfo = "Night time, inverter polling disabled, "; commInfo = "Night time, inverter polling disabled, ";
if(obj["ts_now"] > (obj["ts_sunrise"] - obj["ts_offset"])) { if(obj["ts_now"] > (obj["ts_sunrise"] - obj["ts_offset"])) {
commInfo += "stopped at " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE')); commInfo += "stopped at " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE'));