diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 25b27361a..cd1e560ea 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -193,9 +193,16 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const // warm water - boiler_data_ww topic register_device_value(TAG_BOILER_DATA_WW, &wwSelTemp_, DeviceValueType::UINT, nullptr, FL_(wwSelTemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_warmwater_temp)); register_device_value(TAG_BOILER_DATA_WW, &wwSetTemp_, DeviceValueType::UINT, nullptr, FL_(wwSetTemp), DeviceValueUOM::DEGREES); - register_device_value(TAG_BOILER_DATA_WW, &wwSelTempLow_, DeviceValueType::UINT, nullptr, FL_(wwSelTempLow), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_warmwater_temp_low)); + register_device_value( + TAG_BOILER_DATA_WW, &wwSelTempLow_, DeviceValueType::UINT, nullptr, FL_(wwSelTempLow), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_warmwater_temp_low)); register_device_value(TAG_BOILER_DATA_WW, &wwSelTempOff_, DeviceValueType::UINT, nullptr, FL_(wwSelTempOff), DeviceValueUOM::DEGREES); - register_device_value(TAG_BOILER_DATA_WW, &wwSelTempSingle_, DeviceValueType::UINT, nullptr, FL_(wwSelTempSingle), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_warmwater_temp_single)); + register_device_value(TAG_BOILER_DATA_WW, + &wwSelTempSingle_, + DeviceValueType::UINT, + nullptr, + FL_(wwSelTempSingle), + DeviceValueUOM::DEGREES, + MAKE_CF_CB(set_warmwater_temp_single)); register_device_value(TAG_BOILER_DATA_WW, &wwType_, DeviceValueType::ENUM, FL_(enum_flow), FL_(wwType), DeviceValueUOM::NONE); register_device_value( TAG_BOILER_DATA_WW, &wwComfort_, DeviceValueType::ENUM, FL_(enum_comfort), FL_(wwComfort), DeviceValueUOM::LIST, MAKE_CF_CB(set_warmwater_mode)); diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 49fcc1f48..f61ece162 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -774,8 +774,8 @@ void Thermostat::process_RC35wwSettings(std::shared_ptr telegram has_update(telegram->read_value(wwDisinfect_, 4)); // 0-off, 0xFF on has_update(telegram->read_value(wwDisinfectDay_, 5)); // 0-6 Day of week, 7 every day has_update(telegram->read_value(wwDisinfectHour_, 6)); - has_update(telegram->read_value(wwMaxTemp_, 8)); // Limiter 60 degrees - has_update(telegram->read_value(wwOneTimeKey_, 9)); // 0-off, 0xFF on + has_update(telegram->read_value(wwMaxTemp_, 8)); // Limiter 60 degrees + has_update(telegram->read_value(wwOneTimeKey_, 9)); // 0-off, 0xFF on } // type 0x6F - FR10/FR50/FR100/FR110/FR120 Junkers @@ -1433,7 +1433,7 @@ bool Thermostat::set_wwMaxTemp(const char * value, const int8_t id) { LOG_WARNING(F("Set warm water max temperature: Invalid value")); return false; } - if (t < 0 || t > 90) { + if (t < 0 || t > 90) { LOG_WARNING(F("Set warm water max temperature: Invalid value")); return false; } @@ -2410,10 +2410,22 @@ void Thermostat::register_device_values() { TAG_THERMOSTAT_DATA, &wwCircProg_, DeviceValueType::ENUM, FL_(enum_wwProgMode), FL_(wwCircProg), DeviceValueUOM::LIST, MAKE_CF_CB(set_wwCircProg)); register_device_value( TAG_THERMOSTAT_DATA, &wwDisinfect_, DeviceValueType::BOOL, nullptr, FL_(wwDisinfect), DeviceValueUOM::BOOLEAN, MAKE_CF_CB(set_wwDisinfect)); - register_device_value( - TAG_THERMOSTAT_DATA, &wwDisinfectDay_, DeviceValueType::ENUM, FL_(enum_wwDisinfectDay), FL_(wwDisinfectDay), DeviceValueUOM::LIST, MAKE_CF_CB(set_wwDisinfectDay)); - register_device_value( - TAG_THERMOSTAT_DATA, &wwDisinfectHour_, DeviceValueType::UINT, nullptr, FL_(wwDisinfectHour), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwDisinfectHour), 0, 23); + register_device_value(TAG_THERMOSTAT_DATA, + &wwDisinfectDay_, + DeviceValueType::ENUM, + FL_(enum_wwDisinfectDay), + FL_(wwDisinfectDay), + DeviceValueUOM::LIST, + MAKE_CF_CB(set_wwDisinfectDay)); + register_device_value(TAG_THERMOSTAT_DATA, + &wwDisinfectHour_, + DeviceValueType::UINT, + nullptr, + FL_(wwDisinfectHour), + DeviceValueUOM::NONE, + MAKE_CF_CB(set_wwDisinfectHour), + 0, + 23); register_device_value(TAG_THERMOSTAT_DATA, &wwMaxTemp_, DeviceValueType::UINT, nullptr, FL_(wwMaxTemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_wwMaxTemp)); register_device_value( TAG_THERMOSTAT_DATA, &wwOneTimeKey_, DeviceValueType::BOOL, nullptr, FL_(wwOneTimeKey), DeviceValueUOM::BOOLEAN, MAKE_CF_CB(set_wwOneTimeKey)); diff --git a/src/emsesp.cpp b/src/emsesp.cpp index dde5a17d8..7ae29c6dd 100644 --- a/src/emsesp.cpp +++ b/src/emsesp.cpp @@ -179,9 +179,9 @@ void EMSESP::init_uart() { uint8_t rx_gpio; uint8_t tx_gpio; EMSESP::webSettingsService.read([&](WebSettings & settings) { - tx_mode = settings.tx_mode; - rx_gpio = settings.rx_gpio; - tx_gpio = settings.tx_gpio; + tx_mode = settings.tx_mode; + rx_gpio = settings.rx_gpio; + tx_gpio = settings.tx_gpio; }); EMSuart::stop(); diff --git a/src/emsesp_stub.hpp b/src/emsesp_stub.hpp index 105dac259..9f8aa5ca8 100644 --- a/src/emsesp_stub.hpp +++ b/src/emsesp_stub.hpp @@ -37,7 +37,7 @@ class EMSESP { static DallasSensor dallassensor_; static uuid::log::Logger logger(); - static ESP8266React esp8266React; + static ESP8266React esp8266React; }; } // namespace emsesp diff --git a/src/web/WebLogService.cpp b/src/web/WebLogService.cpp index a111c8058..0fb4b4ab5 100644 --- a/src/web/WebLogService.cpp +++ b/src/web/WebLogService.cpp @@ -58,10 +58,12 @@ uuid::log::Level WebLogService::log_level() const { } void WebLogService::log_level(uuid::log::Level level) { - EMSESP::webSettingsService.update([&](WebSettings & settings) { - settings.weblog_level = level; - return StateUpdateResult::CHANGED; - }, "local"); + EMSESP::webSettingsService.update( + [&](WebSettings & settings) { + settings.weblog_level = level; + return StateUpdateResult::CHANGED; + }, + "local"); uuid::log::Logger::register_handler(this, level); } @@ -74,10 +76,12 @@ void WebLogService::maximum_log_messages(size_t count) { while (log_messages_.size() > maximum_log_messages_) { log_messages_.pop_front(); } - EMSESP::webSettingsService.update([&](WebSettings & settings) { - settings.weblog_buffer = count; - return StateUpdateResult::CHANGED; - }, "local"); + EMSESP::webSettingsService.update( + [&](WebSettings & settings) { + settings.weblog_buffer = count; + return StateUpdateResult::CHANGED; + }, + "local"); } bool WebLogService::compact() { @@ -86,10 +90,12 @@ bool WebLogService::compact() { void WebLogService::compact(bool compact) { compact_ = compact; - EMSESP::webSettingsService.update([&](WebSettings & settings) { - settings.weblog_compact = compact; - return StateUpdateResult::CHANGED; - }, "local"); + EMSESP::webSettingsService.update( + [&](WebSettings & settings) { + settings.weblog_compact = compact; + return StateUpdateResult::CHANGED; + }, + "local"); } WebLogService::QueuedLogMessage::QueuedLogMessage(unsigned long id, std::shared_ptr && content) @@ -113,7 +119,6 @@ void WebLogService::operator<<(std::shared_ptr message) { if (time_offset_ < offset - 1 || time_offset_ > offset + 1) { time_offset_ = offset; } - } }); }