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

recreate ha config on readonly changes

Browse Source
This commit is contained in:
MichaelDvP
2022-03-30 15:55:24 +02:00
parent 54d09ceb51
commit 7c37c9a4c8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/emsdevice.cpp
View File

@@ -858,11 +858,16 @@ void EMSdevice::reset_entity_masks() {
// disable/exclude/mask_out a device entity based on the id // disable/exclude/mask_out a device entity based on the id
void EMSdevice::mask_entity(const std::string & entity_id) { void EMSdevice::mask_entity(const std::string & entity_id) {
// first character contains mask flags // first character contains mask flags
uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str()); uint8_t flag = (Helpers::hextoint(entity_id.substr(0, 2).c_str()) << 4);
for (auto & dv : devicevalues_) { for (auto & dv : devicevalues_) {
std::string entity = dv.tag < DeviceValueTAG::TAG_HC1 ? read_flash_string(dv.short_name) : tag_to_string(dv.tag) + "/" + read_flash_string(dv.short_name); std::string entity = dv.tag < DeviceValueTAG::TAG_HC1 ? read_flash_string(dv.short_name) : tag_to_string(dv.tag) + "/" + read_flash_string(dv.short_name);
if (entity == entity_id.substr(2)) { if (entity == entity_id.substr(2)) {
dv.state = (dv.state & 0x0F) | (flag << 4); // set state high bits to flag, turn off active and ha flags // remove ha config on change of dv_readonly flag
if (Mqtt::ha_enabled() && ((dv.state ^ flag) & DeviceValueState::DV_READONLY)) {
dv.remove_state(DeviceValueState::DV_HA_CONFIG_CREATED);
Mqtt::publish_ha_sensor_config(dv, "", "", true); // delete topic (remove = true)
}
dv.state = (dv.state & 0x0F) | flag; // set state high bits to flag
return; return;
} }
} }

2
src/emsdevicevalue.h
View File

@@ -114,7 +114,7 @@ class DeviceValue {
DV_DEFAULT = 0, // 0 - does not yet have a value DV_DEFAULT = 0, // 0 - does not yet have a value
DV_ACTIVE = (1 << 0), // 1 - has a validated real value DV_ACTIVE = (1 << 0), // 1 - has a validated real value
DV_HA_CONFIG_CREATED = (1 << 1), // 2 - set if the HA config topic has been created DV_HA_CONFIG_CREATED = (1 << 1), // 2 - set if the HA config topic has been created
DV_HA_CLIMATE_NO_RT = (1 << 2), // 3 - climate created without roomTemp DV_HA_CLIMATE_NO_RT = (1 << 2), // 4 - climate created without roomTemp
// high nibble as mask for exclusions & special functions // high nibble as mask for exclusions & special functions
DV_WEB_EXCLUDE = (1 << 4), // 16 - not shown on web DV_WEB_EXCLUDE = (1 << 4), // 16 - not shown on web