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

shower-times in system/settings

Browse Source
This commit is contained in:
MichaelDvP
2022-05-06 07:59:07 +02:00
parent 39d9eec890
commit 90aa385326
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shower.h
View File

@@ -30,6 +30,8 @@ class Shower {
void set_shower_state(bool state, bool force = false); void set_shower_state(bool state, bool force = false);
/* unused header
*
bool shower_alert() const { bool shower_alert() const {
return shower_alert_; return shower_alert_;
} }
@@ -45,6 +47,7 @@ class Shower {
void shower_timer(const bool shower_timer) { void shower_timer(const bool shower_timer) {
shower_timer_ = shower_timer; shower_timer_ = shower_timer;
} }
*/
private: private:
static uuid::log::Logger logger_; static uuid::log::Logger logger_;

4
src/system.cpp
View File

@@ -1000,8 +1000,8 @@ bool System::command_settings(const char * value, const int8_t id, JsonObject &
node["shower_timer"] = settings.shower_timer; node["shower_timer"] = settings.shower_timer;
node["shower_alert"] = settings.shower_alert; node["shower_alert"] = settings.shower_alert;
if (settings.shower_alert) { if (settings.shower_alert) {
node["shower_alert_coldshot"] = settings.shower_alert_coldshot / 1000; // seconds node["shower_alert_coldshot"] = settings.shower_alert_coldshot; // seconds
node["shower_alert_trigger"] = settings.shower_alert_trigger / 60000; // minutes node["shower_alert_trigger"] = settings.shower_alert_trigger; // minutes
} }
node["rx_gpio"] = settings.rx_gpio; node["rx_gpio"] = settings.rx_gpio;