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

auto-formatting

Browse Source
This commit is contained in:
proddy
2021-08-26 10:42:40 +02:00
parent 7529f3a73e
commit 0f83870db0
5 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/boiler.cpp
View File

@@ -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));

26
src/devices/thermostat.cpp
View File

@@ -774,8 +774,8 @@ void Thermostat::process_RC35wwSettings(std::shared_ptr<const Telegram> 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));

6
src/emsesp.cpp
View File

@@ -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();

2
src/emsesp_stub.hpp
View File

@@ -37,7 +37,7 @@ class EMSESP {
static DallasSensor dallassensor_;
static uuid::log::Logger logger();
static ESP8266React esp8266React;
static ESP8266React esp8266React;
};
} // namespace emsesp

31
src/web/WebLogService.cpp
View File

@@ -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<uuid::log::Message> && content)
@@ -113,7 +119,6 @@ void WebLogService::operator<<(std::shared_ptr<uuid::log::Message> message) {
if (time_offset_ < offset - 1 || time_offset_ > offset + 1) {
time_offset_ = offset;
}
}
});
}