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 branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4

Browse Source
This commit is contained in:
MichaelDvP
2022-05-02 11:21:35 +02:00
parent 0c6c7f999f 2ae5d4dcf5
commit 9c38987dd4
17 changed files with 262 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system.cpp
View File

@@ -998,6 +998,10 @@ 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["rx_gpio"] = settings.rx_gpio;
node["tx_gpio"] = settings.tx_gpio;