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

Merge branch 'dev' into dev2

Browse Source
This commit is contained in:
MichaelDvP
2023-12-12 14:41:31 +01:00
parent 72f4d00cb3 d78d4aed9d
commit 29a3e79804
32 changed files with 3623 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/devices/boiler.cpp
View File

@@ -1149,8 +1149,8 @@ void Boiler::process_UBAFactory(std::shared_ptr<const Telegram> telegram) {
void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, selFlowTemp_, 0);
has_update(telegram, curFlowTemp_, 1);
has_update(telegram, selBurnPow_, 3); // burn power max setting
has_update(telegram, curBurnPow_, 4);
// has_update(telegram, selBurnPow_, 3); // burn power max setting
// has_update(telegram, curBurnPow_, 4);
has_update(telegram, boilerState_, 5); // bits 0-heat, 1-dhw, 2-service, 3-flame, 4-preheat, 5-lock-Err, 6-block-err, 7-maint
has_bitupdate(telegram, burnGas_, 7, 0);
has_bitupdate(telegram, burnGas2_, 7, 1);
@@ -1184,10 +1184,20 @@ void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, serviceCodeNumber_, 20);
if (telegram->offset <= 4 && telegram->offset + telegram->message_length > 7) {
if (burnGas_ || burnGas2_) {
if (telegram->offset <= 3 && telegram->offset + telegram->message_length > 7) {
// some boiler only switch burnGas and have no other burner values, https://github.com/emsesp/EMS-ESP32/discussions/1483
uint8_t selBurnPow = selBurnPow_;
uint8_t curBurnPow = curBurnPow_;
telegram->read_value(selBurnPow, 3);
telegram->read_value(curBurnPow, 4);
if (burnGas_ && selBurnPow == 0 && curBurnPow == 0) {
boilerState_ |= 0x08; // set flame signal
curBurnPow = 100;
selBurnPow = 100;
}
has_update(selBurnPow_, selBurnPow);
has_update(curBurnPow_, curBurnPow);
check_active(); // do a quick check to see if the hot water or heating is active
}
}

4
src/devices/heatpump.cpp
View File

@@ -88,7 +88,7 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&hybridDHW_,
DeviceValueType::ENUM,
FL_(enum_comfort2),
FL_(enum_comfort1),
FL_(hybridDHW),
DeviceValueUOM::NONE,
MAKE_CF_CB(set_hybridDHW));
@@ -332,7 +332,7 @@ bool Heatpump::set_lowNoiseStop(const char * value, const int8_t id) {
}
bool Heatpump::set_hybridDHW(const char * value, const int8_t id) {
uint8_t v;
if (!Helpers::value2enum(value, v, FL_(enum_comfort2))) {
if (!Helpers::value2enum(value, v, FL_(enum_comfort1))) {
return false;
}
write_command(0x998, 1, v, 0x998);

9
src/devices/thermostat.cpp
View File

@@ -718,6 +718,15 @@ void Thermostat::process_RemoteHumidity(std::shared_ptr<const Telegram> telegram
// has_update(telegram, dewtemperature_, 0); // this is int8
has_update(telegram, humidity_, 1);
has_update(telegram, dewtemperature_, 2); // this is int16
// some thermostats use short telegram with int8 dewpoint, https://github.com/emsesp/EMS-ESP32/issues/1491
if (telegram->offset == 0 && telegram->message_length < 4) {
int8_t dew = dewtemperature_ / 10;
telegram->read_value(dew, 0);
if (dew != EMS_VALUE_INT_NOTSET && dewtemperature_ != dew * 10) {
dewtemperature_ = dew * 10;
has_update(dewtemperature_);
}
}
}
// 0x273 - for reading temperaturcorrection from the RC100H remote thermostat (0x38, 0x39, ..)