Support ESP IDF v5.0

CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-include($ENV{IOT_SOLUTION_PATH}/component.cmake)
+#include($ENV{IOT_SOLUTION_PATH}/component.cmake)
 
 project(blinky)
 

main/CMakeLists.txt

@@ -11,9 +11,9 @@ idf_component_register(
             "leds.cpp"
             "presets.cpp"
             "spi_leds.cpp"
-            "screen_leds.cpp"
+#            "screen_leds.cpp"
+#            "display.cpp"
             "rmt_leds.cpp"
-            "display.cpp"
             "patterns/gradient.cpp"
             "patterns/random.cpp"
             "patterns/sparkle.cpp"

main/main.cpp

@@ -16,7 +16,7 @@ static const char *TAG = "blinky";
 #include "presets.hpp"
 #include "utils.hpp"
 #include "spi_leds.hpp"
-#include "screen_leds.hpp"
+//#include "screen_leds.hpp"
 #include "rmt_leds.hpp"
 
 

main/mqtt.cpp

@@ -16,10 +16,10 @@ typedef struct {
 
 static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) {
     mqtt_client_data *client_data = (mqtt_client_data*)handler_args;
-    ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id);
+    ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%ld", base, event_id);
     esp_mqtt_event_handle_t event = (esp_mqtt_event_handle_t)event_data;
     esp_mqtt_client_handle_t client = event->client;
-    int msg_id;
+
     switch ((esp_mqtt_event_id_t)event_id) {
     case MQTT_EVENT_CONNECTED:
         ESP_LOGD(TAG, "MQTT_EVENT_CONNECTED");
@@ -84,11 +84,15 @@ esp_mqtt_client_handle_t start_mqtt_client(
     client_data->data = data;
 
     const esp_mqtt_client_config_t mqtt_cfg = {
-        .uri = CONFIG_BROKER_URI,
-        .username = CONFIG_BROKER_USER,
-        .password = CONFIG_BROKER_PASSWORD,
-        .buffer_size = 4096,
-        .cert_pem = (const char *)broker_pem_start,
+        .broker = {
+            .address = {.uri = CONFIG_BROKER_URI},
+            .verification = {.certificate = (const char *)broker_pem_start},
+        },
+        .credentials = {
+            .username = CONFIG_BROKER_USER,
+            .authentication = {.password = CONFIG_BROKER_PASSWORD},
+        },
+        .buffer = {.size = 4096},
     };
 
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);