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

add wwflowtempoffset, add cascaded boilers without values

Browse Source
This commit is contained in:
MichaelDvP
2021-03-11 11:59:43 +01:00
parent d53e742fee
commit a5c9849aad
5 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/emsesp.cpp
View File

@@ -878,7 +878,8 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, std::
// sometimes boilers share the same product id as controllers
// so only add boilers if the device_id is 0x08, which is fixed for EMS
if (device.device_type == DeviceType::BOILER) {
if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER) {
if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER ||
(device_id >= EMSdevice::EMS_DEVICE_ID_BOILER_1 && device_id <= EMSdevice::EMS_DEVICE_ID_BOILER_F)) {
device_p = &device;
break;
}
@@ -932,7 +933,7 @@ bool EMSESP::command_info(uint8_t device_type, JsonObject & json, const int8_t i
for (const auto & emsdevice : emsdevices) {
if (emsdevice && (emsdevice->device_type() == device_type) && ((device_type != DeviceType::THERMOSTAT) || (emsdevice->device_id() == EMSESP::actual_master_thermostat()))) {
has_value |= emsdevice->generate_values_json(json, tag, (id == -1), true); // console & nested
has_value |= emsdevice->generate_values_json(json, tag, true, (id == -1)); // nested, console as default
}
}