use only espMqttClient queue

Author: MichaelDvP

lib/espMqttClient/src/MqttClient.cpp

@@ -707,9 +707,7 @@ uint16_t MqttClient::getQueue() const {
     espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it    = _outbox.front();
     uint16_t                                                 count = 0;
     while (it) {
-        if (it.get()->packet.packetType() == PacketType.PUBLISH) {
-            ++count;
-        }
+        ++count;
         ++it;
     }
     EMC_SEMAPHORE_GIVE();

src/emsdevice.cpp

@@ -1689,23 +1689,26 @@ void EMSdevice::mqtt_ha_entity_config_create() {
     for (auto & dv : devicevalues_) {
         if (!strcmp(dv.short_name, FL_(haclimate)[0]) && !dv.has_state(DeviceValueState::DV_API_MQTT_EXCLUDE) && dv.has_state(DeviceValueState::DV_ACTIVE)) {
             if (*(int8_t *)(dv.value_p) == 1 && (!dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED) || dv.has_state(DeviceValueState::DV_HA_CLIMATE_NO_RT))) {
-                dv.remove_state(DeviceValueState::DV_HA_CLIMATE_NO_RT);
-                dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
-                Mqtt::publish_ha_climate_config(dv.tag, true, false, dv.min, dv.max); // roomTemp
+                if (Mqtt::publish_ha_climate_config(dv.tag, true, false, dv.min, dv.max)) { // roomTemp
+                    dv.remove_state(DeviceValueState::DV_HA_CLIMATE_NO_RT);
+                    dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
+                }
             } else if (*(int8_t *)(dv.value_p) == 0
                        && (!dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED) || !dv.has_state(DeviceValueState::DV_HA_CLIMATE_NO_RT))) {
-                dv.add_state(DeviceValueState::DV_HA_CLIMATE_NO_RT);
-                dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
-                Mqtt::publish_ha_climate_config(dv.tag, false, false, dv.min, dv.max); // no roomTemp
+                if (Mqtt::publish_ha_climate_config(dv.tag, false, false, dv.min, dv.max)) { // no roomTemp
+                    dv.add_state(DeviceValueState::DV_HA_CLIMATE_NO_RT);
+                    dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
+                }
             }
         }
 
         if (!dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED) && (dv.type != DeviceValueType::CMD) && dv.has_state(DeviceValueState::DV_ACTIVE)
             && !dv.has_state(DeviceValueState::DV_API_MQTT_EXCLUDE)) {
             // create_device_config is only done once for the EMS device. It can added to any entity, so we take the first
-            Mqtt::publish_ha_sensor_config(dv, name(), brand_to_char(), false, create_device_config);
-            dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
-            create_device_config = false; // only create the main config once
+            if (Mqtt::publish_ha_sensor_config(dv, name(), brand_to_char(), false, create_device_config)) {
+                dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
+                create_device_config = false; // only create the main config once
+            }
 #ifndef EMSESP_STANDALONE
             // always create minimum one config
             if (ESP.getMaxAllocHeap() < (6 * 1024) || (!emsesp::EMSESP::system_.PSram() && ESP.getFreeHeap() < (65 * 1024))) {

src/emsesp.cpp

@@ -493,7 +493,7 @@ void EMSESP::publish_all_loop() {
     }
 
     // wait for free queue before sending next message, HA-messages are also queued
-    if (!Mqtt::is_empty()) {
+    if (Mqtt::publish_queued() > 0) {
         return;
     }