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

auto formatting

Browse Source
This commit is contained in:
proddy
2020-11-08 20:54:08 +01:00
parent 4ce0763170
commit 5088e3acee
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/thermostat.cpp
View File

@@ -114,7 +114,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
monitor_typeids = {0x02A5, 0x02A6, 0x02A7, 0x02A8}; monitor_typeids = {0x02A5, 0x02A6, 0x02A7, 0x02A8};
set_typeids = {0x02B9, 0x02BA, 0x02BB, 0x02BC}; set_typeids = {0x02B9, 0x02BA, 0x02BB, 0x02BC};
summer_typeids = {0x02AF, 0x02B0, 0x02B1, 0x02B2}; summer_typeids = {0x02AF, 0x02B0, 0x02B1, 0x02B2};
curve_typeids = {0x029B, 0x029C, 0x029D, 0x029E}; curve_typeids = {0x029B, 0x029C, 0x029D, 0x029E};
for (uint8_t i = 0; i < monitor_typeids.size(); i++) { for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
register_telegram_type(monitor_typeids[i], F("RC300Monitor"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Monitor(t); }); register_telegram_type(monitor_typeids[i], F("RC300Monitor"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Monitor(t); });
register_telegram_type(set_typeids[i], F("RC300Set"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Set(t); }); register_telegram_type(set_typeids[i], F("RC300Set"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Set(t); });
@@ -176,7 +176,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
for (uint8_t i = 0; i < curve_typeids.size(); i++) { for (uint8_t i = 0; i < curve_typeids.size(); i++) {
EMSESP::send_read_request(curve_typeids[i], device_id); EMSESP::send_read_request(curve_typeids[i], device_id);
} }
} // namespace emsesp }
// prepare data for Web UI // prepare data for Web UI
void Thermostat::device_info_web(JsonArray & root) { void Thermostat::device_info_web(JsonArray & root) {
@@ -1316,7 +1316,6 @@ void Thermostat::process_RC300Curve(std::shared_ptr<const Telegram> telegram) {
} else { } else {
changed_ |= telegram->read_value(hc->maxflowtemp, 7); changed_ |= telegram->read_value(hc->maxflowtemp, 7);
} }
} }
// types 0x31B (and 0x31C?) // types 0x31B (and 0x31C?)
@@ -2042,7 +2041,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
offset = 0x04; // eco offset offset = 0x04; // eco offset
break; break;
case HeatingCircuit::Mode::OFFSET: case HeatingCircuit::Mode::OFFSET:
offset = 2; offset = 2;
set_typeid = summer_typeids[hc->hc_num() - 1]; set_typeid = summer_typeids[hc->hc_num() - 1];
validate_typeid = set_typeid; validate_typeid = set_typeid;
break; break;
@@ -2066,19 +2065,19 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
} }
factor = 1; factor = 1;
break; break;
case HeatingCircuit::Mode::NOFROST: case HeatingCircuit::Mode::NOFROST:
set_typeid = curve_typeids[hc->hc_num() - 1]; set_typeid = curve_typeids[hc->hc_num() - 1];
validate_typeid = set_typeid; validate_typeid = set_typeid;
offset = 6; offset = 6;
factor = 1; factor = 1;
break; break;
case HeatingCircuit::Mode::ROOMINFLUENCE: case HeatingCircuit::Mode::ROOMINFLUENCE:
set_typeid = summer_typeids[hc->hc_num() - 1]; set_typeid = summer_typeids[hc->hc_num() - 1];
validate_typeid = set_typeid; validate_typeid = set_typeid;
offset = 0; offset = 0;
factor = 1; factor = 1;
break; break;
default: default:
case HeatingCircuit::Mode::AUTO: case HeatingCircuit::Mode::AUTO:
uint8_t mode_ = hc->get_mode(this->flags()); uint8_t mode_ = hc->get_mode(this->flags());
if (mode_ == HeatingCircuit::Mode::MANUAL) { if (mode_ == HeatingCircuit::Mode::MANUAL) {
@@ -2387,5 +2386,4 @@ void Thermostat::add_commands() {
} }
} }
} // namespace emsesp } // namespace emsesp