From 591a81b22a4fa5b580f777f40acaa6ae41a83964 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 27 Jun 2020 22:50:30 +0200 Subject: [PATCH 1/3] text change --- src/devices/thermostat.cpp | 2 +- src/emsdevice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 899afc518..42d86d839 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1060,7 +1060,7 @@ void Thermostat::process_RC300Monitor(std::shared_ptr telegram) std::shared_ptr hc = heating_circuit(telegram); telegram->read_value(hc->curr_roomTemp, 0); // is * 10 - + telegram->read_bitvalue(hc->mode_type, 10, 1); telegram->read_bitvalue(hc->mode, 10, 0); // bit 1, mode (auto=1 or manual=0) diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index cd6f94797..a1bd58acf 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -249,7 +249,7 @@ bool EMSdevice::handle_telegram(std::shared_ptr telegram) { return false; } - LOG_DEBUG(F("Processing %s..."), uuid::read_flash_string(tf.telegram_type_name_).c_str()); + LOG_DEBUG(F("Decoding %s"), uuid::read_flash_string(tf.telegram_type_name_).c_str()); tf.process_function_(telegram); return true; } From c5e7806fb12748f89b9f20107e2187c00c1c8fe2 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 27 Jun 2020 22:50:36 +0200 Subject: [PATCH 2/3] a30 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 02187b317..96124d601 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "2.0.0a29" +#define EMSESP_APP_VERSION "2.0.0a30" From b06f3eb41f5b50d17d32e82fa5f33df4fc2dd24c Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 27 Jun 2020 22:51:19 +0200 Subject: [PATCH 3/3] ww comfort setting back to 0, D8, EC - #413 --- src/devices/boiler.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 27ca8fc49..63c8c67b8 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -692,24 +692,23 @@ void Boiler::set_flow_temp(const uint8_t temperature) { } // 1=hot, 2=eco, 3=intelligent +// note some boilers do not have this setting, than it's done by thermostat +// on a RC35 it's by EMSESP::send_write_request(0x37, 0x10, 2, &set, 1, 0); (set is 1,2,3) void Boiler::set_warmwater_mode(const uint8_t comfort) { uint8_t set; if (comfort == 1) { - LOG_INFO(F("Setting boiler warm water to hot")); - set = 1; + LOG_INFO(F("Setting boiler warm water to Hot")); + set = 0x00; } else if (comfort == 2) { - LOG_INFO(F("Setting boiler warm water to eco")); - set = 0; + LOG_INFO(F("Setting boiler warm water to Eco")); + set = 0xD8; } else if (comfort == 3) { - LOG_INFO(F("Setting boiler warm water to intelligent")); - set = 2; + LOG_INFO(F("Setting boiler warm water to Intelligent")); + set = 0xEC; } else { return; // do nothing } - write_command(EMS_TYPE_UBAParameterWW, 9, comfort); - // some boilers do not have this setting, than it's done by thermostat - // Test for RC35, but not a good way, we are here in boiler context. - // EMSESP::send_write_request(0x37, 0x10, 2, &set, 1, 0); // for RC35, maybe work also on RC300 + write_command(EMS_TYPE_UBAParameterWW, 9, set); } // turn on/off warm water