Code fixes (driven by CI report)

Author: qfisch

examples/delegatedWifiUsage/delegatedWifiUsage.ino

@@ -1,5 +1,4 @@
-#include "MqttMailingService.h"
-#include <Arduino.h>
+#include "Sensirion_UPT_MQTT_Client.h"
 #include <MeasurementFormatting.cpp>
 
 /*

examples/selfManagedWifiUsage/selfManagedWifiUsage.ino

@@ -1,5 +1,4 @@
-#include "MqttMailingService.h"
-#include <Arduino.h>
+#include "Sensirion_UPT_MQTT_Client.h"
 #include <WiFi.h>
 #include <MeasurementFormatting.cpp>
 

src/MqttMailingService.cpp

@@ -3,6 +3,8 @@
 
 const char* TAG = "MQTT Mail";
 esp_mqtt_client_handle_t MqttMailingService::mEspMqttClient = nullptr;
+esp_event_loop_handle_t MqttMailingService::mEspMqttEventLoopHandle = nullptr;
+
 
 const uint8_t ssl_cert[] =
     "------BEGIN CERTIFICATE-----\n" MQTT_BROKER_CERTIFICATE_OVERRIDE
@@ -227,11 +229,10 @@ void MqttMailingService::initEspMqttClient() {
                                                 uxTaskPriorityGet(nullptr),
                                             .task_stack_size = 2 * 1024,
                                             .task_core_id = tskNO_AFFINITY};
-    esp_event_loop_handle_t mqtt_loop_handle;
-    esp_event_loop_create(&mqtt_loop_args, &mqtt_loop_handle);
+    esp_event_loop_create(&mqtt_loop_args, &mEspMqttEventLoopHandle);
 
     // Config
-    esp_mqtt_client_config_t mqtt_cfg = {.event_loop_handle = mqtt_loop_handle,
+    esp_mqtt_client_config_t mqtt_cfg = {.event_loop_handle = mEspMqttEventLoopHandle,
                                          .uri = mBrokerFullURI,
                                          .lwt_topic = mLwtTopic,
                                          .lwt_msg = mLwtMessage,
@@ -247,7 +248,7 @@ void MqttMailingService::initEspMqttClient() {
 
     esp_mqtt_client_register_event(
         mEspMqttClient, static_cast<esp_mqtt_event_id_t>(ESP_EVENT_ANY_ID),
-        espMqttEventHandler, this);
+        MqttMailingService::espMqttEventHandler, this);
 
     mState = MqttMailingServiceState::INITIALIZED;
     ESP_LOGI(TAG, "ESP MQTT client initialized.");

src/MqttMailingService.h

@@ -132,13 +132,6 @@ class __attribute__((unused)) MqttMailingService {
      */
     __attribute__((unused)) void setRetainFlag(int flag);
 
-    /**
-     * @brief returns the QueueHandle_t to the mailbox
-     *
-     * @note: The mailbox is only available once initialized
-     */
-    __attribute__((unused)) QueueHandle_t getMailbox() const;
-
     /**
      * @brief returns the state of the service
      */
@@ -215,6 +208,7 @@ class __attribute__((unused)) MqttMailingService {
 
     // ESP MQTT client
     static esp_mqtt_client_handle_t mEspMqttClient;
+    static esp_event_loop_handle_t mEspMqttEventLoopHandle;
     void initEspMqttClient();
     void startEspMqttClient();
     void destroyEspMqttClient();