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

remove burnMinPower, #2918

Browse Source
This commit is contained in:
MichaelDvP
2026-01-30 07:50:54 +01:00
parent 5641d53cc3
commit 92d82c0a00
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -16,3 +16,4 @@ For more details go to [emsesp.org](https://emsesp.org/).
- weblogbuffer up to 1000 messages with PSRAM, mentioned in [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933) - weblogbuffer up to 1000 messages with PSRAM, mentioned in [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
- validate custom entity writes, [#2931](https://github.com/emsesp/EMS-ESP32/issues/2931) - validate custom entity writes, [#2931](https://github.com/emsesp/EMS-ESP32/issues/2931)
- remove wrong burnMinPower [#2918](https://github.com/emsesp/EMS-ESP32/issues/2918)

19
src/devices/boiler.cpp
View File

@@ -213,12 +213,13 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &fanWork_, DeviceValueType::BOOL, FL_(fanWork), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &fanWork_, DeviceValueType::BOOL, FL_(fanWork), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &ignWork_, DeviceValueType::BOOL, FL_(ignWork), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &ignWork_, DeviceValueType::BOOL, FL_(ignWork), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &oilPreHeat_, DeviceValueType::BOOL, FL_(oilPreHeat), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &oilPreHeat_, DeviceValueType::BOOL, FL_(oilPreHeat), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, // remove burnMinPower, #2918
&burnMinPower_, // register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
DeviceValueType::UINT8, // &burnMinPower_,
FL_(burnMinPower), // DeviceValueType::UINT8,
DeviceValueUOM::PERCENT, // FL_(burnMinPower),
MAKE_CF_CB(set_min_power)); // DeviceValueUOM::PERCENT,
// MAKE_CF_CB(set_min_power));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&burnMaxPower_, &burnMaxPower_,
DeviceValueType::UINT8, DeviceValueType::UINT8,
@@ -1290,7 +1291,7 @@ void Boiler::process_UBAFactory(std::shared_ptr<const Telegram> telegram) {
has_update(nomPower_, nomPower); has_update(nomPower_, nomPower);
} }
if (min <= max) { if (min <= max) {
set_minmax(&burnMinPower_, 0, max); // set_minmax(&burnMinPower_, 0, max); // removed #2918
set_minmax(&burnMaxPower_, min, max); set_minmax(&burnMaxPower_, min, max);
set_minmax(&wwMaxPower_, min, max); set_minmax(&wwMaxPower_, min, max);
set_minmax(&selBurnPow_, 0, max); set_minmax(&selBurnPow_, 0, max);
@@ -1376,7 +1377,7 @@ void Boiler::process_UBAParameters(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, heatingActivated_, 0); has_update(telegram, heatingActivated_, 0);
has_update(telegram, heatingTemp_, 1); has_update(telegram, heatingTemp_, 1);
has_update(telegram, burnMaxPower_, 2); has_update(telegram, burnMaxPower_, 2);
has_update(telegram, burnMinPower_, 3); // has_update(telegram, burnMinPower_, 3); // removed #2918
has_update(telegram, boilHystOff_, 4); has_update(telegram, boilHystOff_, 4);
has_update(telegram, boilHystOn_, 5); has_update(telegram, boilHystOn_, 5);
has_update(telegram, burnMinPeriod_, 6); has_update(telegram, burnMinPeriod_, 6);
@@ -1595,7 +1596,7 @@ void Boiler::process_UBAParametersPlus(std::shared_ptr<const Telegram> telegram)
has_update(telegram, heatingActivated_, 0); has_update(telegram, heatingActivated_, 0);
has_update(telegram, heatingTemp_, 1); has_update(telegram, heatingTemp_, 1);
has_update(telegram, burnMaxPower_, 4); has_update(telegram, burnMaxPower_, 4);
has_update(telegram, burnMinPower_, 5); // has_update(telegram, burnMinPower_, 5); // removed #2918
has_update(telegram, boilHystOff_, 8); has_update(telegram, boilHystOff_, 8);
has_update(telegram, boilHystOn_, 9); has_update(telegram, boilHystOn_, 9);
has_update(telegram, burnMinPeriod_, 10); has_update(telegram, burnMinPeriod_, 10);