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

Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10

Browse Source
This commit is contained in:
MichaelDvP
2020-01-29 08:16:25 +01:00
parent 9ad6bbfadd 03489d43f4
commit 610b9525c7
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ems.cpp
View File

@@ -2369,11 +2369,15 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
break;
default:
case 0: // automatic selection, if no type is defined, we use the standard code
EMS_TxTelegram.offset = EMS_OFFSET_RC35Set_seltemp;
/* commented out for https://github.com/proddy/EMS-ESP/issues/310
if (EMS_Thermostat.hc[hc_num - 1].day_mode == 0) {
EMS_TxTelegram.offset = EMS_OFFSET_RC35Set_temp_night;
} else if (EMS_Thermostat.hc[hc_num - 1].day_mode == 1) {
EMS_TxTelegram.offset = EMS_OFFSET_RC35Set_temp_day;
}
*/
break;
}
@@ -2719,7 +2723,7 @@ void ems_setWarmTapWaterActivated(bool activated) {
EMS_TxTelegram.data[3] = EMS_TxTelegram.offset; // offset
// we use the special test mode 0x1D for this. Setting the first data to 5A puts the system into test mode and
// a setting of 0x00 puts it back into normal operarting mode
// a setting of 0x00 puts it back into normal operating mode
// when in test mode we're able to mess around with the 3-way valve settings
if (!activated) {
// on