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

add energy and meter for cooling #1940

Browse Source
This commit is contained in:
MichaelDvP
2024-08-16 16:42:16 +02:00
parent 00e2808afe
commit 388245ece9
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/devices/boiler.cpp
View File

@@ -439,6 +439,12 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
DeviceValueNumOp::DV_NUMOP_DIV100,
FL_(nrgHeat),
DeviceValueUOM::KWH);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&nrgCool_,
DeviceValueType::UINT24,
DeviceValueNumOp::DV_NUMOP_DIV100,
FL_(nrgCool),
DeviceValueUOM::KWH);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&meterTotal_,
DeviceValueType::UINT24,
@@ -463,6 +469,12 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
DeviceValueNumOp::DV_NUMOP_DIV100,
FL_(meterHeat),
DeviceValueUOM::KWH);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&meterCool_,
DeviceValueType::UINT24,
DeviceValueNumOp::DV_NUMOP_DIV100,
FL_(meterCool),
DeviceValueUOM::KWH);
register_device_value(DeviceValueTAG::TAG_DHW1, &meterWw_, DeviceValueType::UINT24, DeviceValueNumOp::DV_NUMOP_DIV100, FL_(meterWw), DeviceValueUOM::KWH);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&upTimeTotal_,
@@ -1970,6 +1982,7 @@ void Boiler::process_HpEnergy(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, nrgTotal_, 0);
has_update(telegram, nrgHeat_, 4);
has_update(telegram, nrgWw_, 12);
has_update(telegram, nrgCool_, 20);
}
// boiler(0x08) -W-> Me(0x0B), ?(0x04AF), data: 00 00 48 B2 00 00 48 55 00 00 00 5D 00 00 01 78 00 00 00 00 00 00 07 61
@@ -1981,6 +1994,7 @@ void Boiler::process_HpMeters(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, meterEHeat_, 8);
has_update(telegram, meterHeat_, 24);
has_update(telegram, meterWw_, 32);
has_update(telegram, meterCool_, 40);
}
void Boiler::process_HpPressure(std::shared_ptr<const Telegram> telegram) {