From 90aa385326fa82b10bf6a6823ca79a188be3a7a2 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 6 May 2022 07:59:07 +0200 Subject: [PATCH] shower-times in system/settings --- src/shower.h | 3 +++ src/system.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/shower.h b/src/shower.h index 809a18031..b4fb29f7c 100644 --- a/src/shower.h +++ b/src/shower.h @@ -30,6 +30,8 @@ class Shower { void set_shower_state(bool state, bool force = false); + /* unused header + * bool shower_alert() const { return shower_alert_; } @@ -45,6 +47,7 @@ class Shower { void shower_timer(const bool shower_timer) { shower_timer_ = shower_timer; } + */ private: static uuid::log::Logger logger_; diff --git a/src/system.cpp b/src/system.cpp index f0f03fad3..f63159737 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1000,8 +1000,8 @@ bool System::command_settings(const char * value, const int8_t id, JsonObject & node["shower_timer"] = settings.shower_timer; node["shower_alert"] = settings.shower_alert; if (settings.shower_alert) { - node["shower_alert_coldshot"] = settings.shower_alert_coldshot / 1000; // seconds - node["shower_alert_trigger"] = settings.shower_alert_trigger / 60000; // minutes + node["shower_alert_coldshot"] = settings.shower_alert_coldshot; // seconds + node["shower_alert_trigger"] = settings.shower_alert_trigger; // minutes } node["rx_gpio"] = settings.rx_gpio;