gilles/shelly_pool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gilles:2014350bc7661b64162e301a377c1a698ae4e040
Branches Tags
gilles:main
..
compare: gilles:09713684824fa423b7a66e8308f5725c7ce55565
Branches Tags
gilles:main

No commits in common. "2014350bc7661b64162e301a377c1a698ae4e040" and "09713684824fa423b7a66e8308f5725c7ce55565" have entirely different histories.
2014350bc7 ... 0971368482

1 changed files with 25 additions and 32 deletions
Show Stats Expand all files Collapse all files

55
pool.js
View File

@ -28,22 +28,12 @@ let status = {
// temperature->duration chart // temperature->duration chart
let filt_time = [ let filt_time = [
[ 5, 2.0 ], // at 5°C, 2 hours of filtering [ 5, 1.0 ], // at 5°C, 1 hour of filtering
[ 8, 3.0 ], [ 10, 2.0 ],
[ 10, 4.0 ], [ 12, 4.0 ],
[ 11, 5.0 ], [ 16, 6.0 ],
[ 12, 6.0 ], [ 24, 8.0 ],
[ 14, 7.0 ], [ 27, 12.0 ],
[ 16, 8.0 ],
[ 18, 9.0 ],
[ 20, 10.0 ],
[ 22, 11.0 ],
[ 24, 12.0 ],
[ 25, 14.0 ],
[ 26, 17.0 ],
[ 27, 20.0 ],
[ 28, 22.0 ],
[ 29, 23.0 ],
[ 30, 24.0 ] [ 30, 24.0 ]
]; ];
@ -72,17 +62,23 @@ function compute_filtration_time(t) {
// [ start1, stop1, start2, stop2, ... ] // [ start1, stop1, start2, stop2, ... ]
function compute_schedule_filt(d) { function compute_schedule_filt(d) {
let start = 17 - d/2; let s = null;
let stop = 17 + d/2; if (d < 2) {
s = [ 9, 9+d ];
while (stop >= 24) } else if (d < 8) {
stop = stop - 24; s = [ 9, 10, 14, 14+d-1 ];
} else if (d < 11) {
if (d < 24) { s = [ 9, 11, 14, 14+d-2 ];
let s = [ start, stop ]; } else if (d < 14) {
} s = [ 9, 9+d-9, 14, 23];
else { } else if (d < 15) {
let s = [ start ]; s = [ 9, 9+d ];
} else if (d < 18) {
s = [ 24-d, 0 ];
} else if (d < 24) {
s = [ 6, d-18 ];
} else {
s = [ 6 ];
} }
return s; return s;
@ -299,10 +295,7 @@ MQTT.subscribe(
"zigbee2mqtt/Piscine", "zigbee2mqtt/Piscine",
function (topic, msg) { function (topic, msg) {
status.tick_mqtt++; status.tick_mqtt++;
print("[POOL] mqtt", topic, msg); print("[POOL] mqtt", topic);
if (msg == "") {
return;
}
let obj = JSON.parse(msg); let obj = JSON.parse(msg);
if (obj.temperature === undefined) { if (obj.temperature === undefined) {
return; return;