Compare commits

..

4 Commits

2 changed files with 20 additions and 39 deletions

3
.gitignore vendored
View File

@ -1,2 +1,3 @@
shelly.conf
*.log *.log
.inspect.json
shelly.conf

56
pool.js
View File

@ -7,7 +7,6 @@ let status = {
temp_yesterday: null, temp_yesterday: null,
update_time: null, update_time: null,
update_time_last: 0,
update_temp_max_last: null, update_temp_max_last: null,
disable_temp: null, disable_temp: null,
@ -24,7 +23,6 @@ let status = {
tick_temp: 0, tick_temp: 0,
tick_lock: 0, tick_lock: 0,
tick_pump: 0, tick_pump: 0,
tick_pump_skip: 0,
tick_day: 0, tick_day: 0,
}; };
@ -243,37 +241,24 @@ function update_temp(temp) {
print("[POOL] update_temp - max:", status.temp_max, "today:", status.temp_today, "yesterday:", status.temp_yesterday); print("[POOL] update_temp - max:", status.temp_max, "today:", status.temp_today, "yesterday:", status.temp_yesterday);
Shelly.call ( let time = Shelly.getComponentStatus("sys").time; // "HH:MM"
"Sys.GetStatus", print("[POOL] time", time);
{},
function (result) {
let time = result.time; // "HH:MM"
print("[POOL] time", time);
// compute current time in float format (12h45 -> 12.75) // compute current time in float format (12h45 -> 12.75)
let t = JSON.parse(time.slice(0,2)) + JSON.parse(time.slice(3,5)) / 60; let t = JSON.parse(time.slice(0,2)) + JSON.parse(time.slice(3,5)) / 60;
if (t < status.update_time) if (t < status.update_time)
update_new_day(); update_new_day();
status.update_time = t; status.update_time = t;
if ((status.temp_max !== null) && (status.temp_max !== status.update_temp_max_last)) { if ((status.temp_max !== null) && (status.temp_max !== status.update_temp_max_last)) {
if ((t - status.update_time_last) > 0.15) { // 9 minutes update_pump(status.temp, status.temp_max, t);
update_pump(status.temp, status.temp_max, t); status.update_temp_max_last = status.temp_max;
status.update_time_last = t; }
status.update_temp_max_last = status.temp_max; else {
} print("[POOL] no temp change, skip update_pump");
else { }
status.tick_pump_skip++;
print("[POOL] to much update_pump, skipped", status.tick_pump_skip);
}
}
else {
print("[POOL] no temp change, skip update_pump");
}
}
);
status.lock_update = false; status.lock_update = false;
} }
@ -350,15 +335,10 @@ Timer.set(
true, true,
function() { function() {
status.tick++; status.tick++;
Shelly.call ( let result = Shelly.getComponentStatus("sys");
"Sys.GetStatus", print("[POOL] tick", result.time);
{}, status.time = result.time;
function (result) { status.uptime = result.uptime;
print("[POOL] tick", result.time);
status.time = result.time;
status.uptime = result.uptime;
}
);
} }
); );