andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-26 16:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
Proddy
2026-01-04 11:41:07 +01:00
committed by GitHub
parent 5a82064a88 8b690d23da
commit 4afe041880
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/thermostat.cpp
View File

@@ -2474,7 +2474,13 @@ bool Thermostat::set_wwcharge(const char * value, const int8_t id) {
} }
if ((model() == EMSdevice::EMS_DEVICE_FLAG_JUNKERS)) { if ((model() == EMSdevice::EMS_DEVICE_FLAG_JUNKERS)) {
write_command(0x0115, 0, b ? 0xFF : 0x00, 0x01D3); // see https://github.com/emsesp/EMS-ESP32/discussions/2860#discussioncomment-15395821
if (dhw->id() == DeviceValueTAG::TAG_DHW2) {
write_command(0x0115, 2, b ? 0xFF : 0, 0x01D3);
} else {
uint16_t data = b ? 0xFFFF : 0;
write_command(0x0115, 0, (uint8_t *)&data, 2, 0x01D3);
}
} else { } else {
write_command(0x02F5 + dhw->offset(), 11, b ? 0xFF : 0x00, 0x02F5 + dhw->offset()); write_command(0x02F5 + dhw->offset(), 11, b ? 0xFF : 0x00, 0x02F5 + dhw->offset());
} }
@@ -4020,7 +4026,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
case HeatingCircuit::Mode::MINFLOW: case HeatingCircuit::Mode::MINFLOW:
set_typeid = summer_typeids[hc->hc()]; set_typeid = summer_typeids[hc->hc()];
validate_typeid = set_typeid; validate_typeid = set_typeid;
offset = hc->heatingtype == 3 ? 8 : 13; offset = hc->heatingtype != 3 && model == EMS_DEVICE_FLAG_BC400 ? 13 : 8;
factor = 1; factor = 1;
break; break;
case HeatingCircuit::Mode::MAXFLOW: case HeatingCircuit::Mode::MAXFLOW: