Merge pull request #1069 from MichaelDvP/tech-upgrade

fix for #1067 and ems-esp restarting
emsesp · Feb 20, 2023 · 050ecd9 · 050ecd9
2 parents 4f91c78 + 395bd60
commit 050ecd9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
@@ -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