andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from kpschaper/fix_shower_alert

Browse Source 
Fix shower timer; doing_cold_shot is never being reset
This commit is contained in:
Proddy
2021-11-07 17:42:49 +01:00
committed by GitHub
parent ea550b1656 9406c76e55
commit 72a59917fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shower.cpp
View File

@@ -60,7 +60,7 @@ void Shower::loop() {
LOG_DEBUG(F("[Shower] hot water still running, starting shower timer")); LOG_DEBUG(F("[Shower] hot water still running, starting shower timer"));
} }
// check if the shower has been on too long // check if the shower has been on too long
else if ((((time_now - timer_start_) > SHOWER_MAX_DURATION) && !doing_cold_shot_) && shower_alert_) { else if ((time_now - timer_start_) > SHOWER_MAX_DURATION) {
shower_alert_start(); shower_alert_start();
} }
} }
@@ -97,6 +97,7 @@ void Shower::loop() {
// at this point we're in the shower cold shot (doing_cold_shot_ == true) // at this point we're in the shower cold shot (doing_cold_shot_ == true)
// keep repeating until the time is up // keep repeating until the time is up
if ((time_now - alert_timer_start_) > SHOWER_COLDSHOT_DURATION) { if ((time_now - alert_timer_start_) > SHOWER_COLDSHOT_DURATION) {
shower_alert_stop();
} }
} }