idf 5 support

256dpi · Jan 11, 2023 · c6066b1 · c6066b1
1 parent 9fd8eac
commit c6066b1
Show file tree

Hide file tree

Showing 5 changed files with 576 additions and 304 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-ESP_IDF_VERSION := "v4.4"
+ESP_IDF_VERSION := "v5.0-rc1"
 
 fmt:
 	clang-format -i ./*.c ./*.h -style="{BasedOnStyle: Google, ColumnLimit: 120, SortIncludes: false}"

diff --git a/esp_tls_lwmqtt.c b/esp_tls_lwmqtt.c
@@ -88,7 +88,7 @@ lwmqtt_err_t esp_tls_lwmqtt_network_connect(esp_tls_lwmqtt_network_t *n, char *h
     if (flags != 0) {
       char verify_buf[100] = {0};
       mbedtls_x509_crt_verify_info(verify_buf, sizeof(verify_buf), "  ! ", flags);
-      ESP_LOGE("esp-mqtt", "%mbedtls_ssl_get_verify_result: %s (%d)", verify_buf, flags);
+      ESP_LOGE("esp-mqtt", "%mbedtls_ssl_get_verify_result: %s (%ld)", verify_buf, flags);
     }
   }
 

diff --git a/esp_tls_lwmqtt.h b/esp_tls_lwmqtt.h
@@ -3,7 +3,6 @@
 
 #include <esp_log.h>
 #include <lwmqtt.h>
-#include <mbedtls/certs.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>

diff --git a/test/main/main.c b/test/main/main.c
@@ -58,16 +58,16 @@ static void restart(void *_) {
 static void event_handler(void *event_handler_arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
   if (event_base == WIFI_EVENT) {
     switch (event_id) {
-      case SYSTEM_EVENT_STA_START:
+      case WIFI_EVENT_STA_START:
         // connect to ap
         ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_connect());
 
         break;
 
-      case SYSTEM_EVENT_STA_GOT_IP:
+      case IP_EVENT_STA_GOT_IP:
         break;
 
-      case SYSTEM_EVENT_STA_DISCONNECTED:
+      case WIFI_EVENT_STA_DISCONNECTED:
         // reconnect Wi-Fi
         ESP_ERROR_CHECK_WITHOUT_ABORT(esp_wifi_connect());
 
@@ -136,6 +136,6 @@ void app_main() {
   esp_mqtt_init(status_callback, message_callback, 256, 2000, 1);
 
   // create tasks
-  xTaskCreatePinnedToCore(process, "process", 2048, NULL, 10, NULL, 1);
-  xTaskCreatePinnedToCore(restart, "restart", 2048, NULL, 10, NULL, 1);
+  xTaskCreatePinnedToCore(process, "process", 4096, NULL, 10, NULL, 1);
+  xTaskCreatePinnedToCore(restart, "restart", 4066, NULL, 10, NULL, 1);
 }