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

Merge pull request #1069 from MichaelDvP/tech-upgrade

Browse Source 
fix for #1067 and ems-esp restarting
This commit is contained in:
Proddy
2023-02-20 19:03:43 +01:00
committed by GitHub
parent 4f91c78b4f 395bd604ce
commit 050ecd9290
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/emsdevice.cpp
View File

@@ -1673,7 +1673,8 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c
// this is called when an MQTT publish is done via an EMS Device in emsesp.cpp::publish_device_values()
void EMSdevice::mqtt_ha_entity_config_remove() {
for (auto & dv : devicevalues_) {
if (dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED)
if ((dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED)
|| (!dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED) && dv.has_state(DeviceValueState::DV_HA_CONFIG_RECREATE)))
&& ((dv.has_state(DeviceValueState::DV_API_MQTT_EXCLUDE)) || (!dv.has_state(DeviceValueState::DV_ACTIVE)))) {
dv.remove_state(DeviceValueState::DV_HA_CONFIG_CREATED);
dv.remove_state(DeviceValueState::DV_HA_CONFIG_RECREATE);
@@ -1726,9 +1727,7 @@ void EMSdevice::mqtt_ha_entity_config_create() {
// remove all config topics in HA
void EMSdevice::ha_config_clear() {
for (auto & dv : devicevalues_) {
if (dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED)) {
dv.add_state(DeviceValueState::DV_HA_CONFIG_RECREATE);
}
dv.add_state(DeviceValueState::DV_HA_CONFIG_RECREATE);
}
ha_config_done(false); // this will force the recreation of the main HA device config