Update to ESP-IDF v5.4 and fix warnings (#193)

KenVanHoeylandt · web-flow · commit 1bb1260ea0b8 · 2025-01-26T15:52:57.000+01:00
- Update to ESP-IDF v5.4
- Fixed a lot of new and existing warnings
- Fix issue with incorrect `EventFlag` usage in Dispatcher
diff --git a/.github/actions/build-firmware/action.yml b/.github/actions/build-firmware/action.yml
@@ -20,7 +20,7 @@ runs:
     - name: 'Build'
       uses: espressif/esp-idf-ci-action@main
       with:
-        esp_idf_version: v5.3.2
+        esp_idf_version: v5.4
         target: ${{ inputs.arch }}
         path: './'
     - name: 'Release'
diff --git a/.github/actions/build-sdk/action.yml b/.github/actions/build-sdk/action.yml
@@ -20,7 +20,7 @@ runs:
     - name: 'Build'
       uses: espressif/esp-idf-ci-action@main
       with:
-        esp_idf_version: v5.3.2
+        esp_idf_version: v5.4
         target: ${{ inputs.arch }}
         path: './'
     - name: 'Release'
diff --git a/App/idf_component.yml b/App/idf_component.yml
@@ -11,4 +11,4 @@ dependencies:
     version: "1.5.0"
     rules:
       - if: "target == esp32s3"
-  idf: '5.3.2'
+  idf: '5.4'
diff --git a/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp b/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp
@@ -44,6 +44,7 @@ static bool setBacklight(uint8_t duty) {
         .timer_sel = TWODOTFOUR_LCD_BACKLIGHT_LEDC_TIMER,
         .duty = duty,
         .hpoint = 0,
+        .sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,
         .flags = {
             .output_invert = false
         }
diff --git a/Boards/LilygoTdeck/Source/InitHardware.cpp b/Boards/LilygoTdeck/Source/InitHardware.cpp
@@ -31,6 +31,7 @@ static bool init_spi() {
         .data5_io_num = 0,
         .data6_io_num = 0,
         .data7_io_num = 0,
+        .data_io_default_level = false,
         .max_transfer_sz = TDECK_SPI_TRANSFER_SIZE_LIMIT,
         .flags = 0,
         .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
diff --git a/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp b/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp
@@ -45,6 +45,7 @@ static bool setBacklight(uint8_t duty) {
         .timer_sel = TDECK_LCD_BACKLIGHT_LEDC_TIMER,
         .duty = duty,
         .hpoint = 0,
+        .sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,
         .flags = {
             .output_invert = 0
         }
@@ -68,6 +69,8 @@ bool TdeckDisplay::start() {
         .user_ctx = nullptr,
         .lcd_cmd_bits = 8,
         .lcd_param_bits = 8,
+        .cs_ena_pretrans = 0,
+        .cs_ena_posttrans = 0,
         .flags = {
             .dc_high_on_cmd = 0,
             .dc_low_on_data = 0,
@@ -134,6 +137,7 @@ bool TdeckDisplay::start() {
     const lvgl_port_display_cfg_t disp_cfg = {
         .io_handle = ioHandle,
         .panel_handle = panelHandle,
+        .control_handle = nullptr,
         .buffer_size = TDECK_LCD_HORIZONTAL_RESOLUTION * TDECK_LCD_DRAW_BUFFER_HEIGHT * (TDECK_LCD_BITS_PER_PIXEL / 8),
         .double_buffer = true, // Disable to free up SPIRAM
         .trans_size = 0,
@@ -145,12 +149,15 @@ bool TdeckDisplay::start() {
             .mirror_x = true,
             .mirror_y = false,
         },
+        .color_format = LV_COLOR_FORMAT_RGB565,
         .flags = {
             .buff_dma = false,
             .buff_spiram = true,
             .sw_rotate = false,
-            .swap_bytes = false
-        },
+            .swap_bytes = false,
+            .full_refresh = false,
+            .direct_mode = false
+        }
     };
 
     displayHandle = lvgl_port_add_disp(&disp_cfg);
diff --git a/Boards/M5stackCore2/Source/InitBoot.cpp b/Boards/M5stackCore2/Source/InitBoot.cpp
@@ -1,6 +1,6 @@
 #include <driver/i2c.h>
 #include <driver/spi_master.h>
-#include <intr_types.h>
+#include <esp_intr_types.h>
 #include "Log.h"
 #include "hal/Core2DisplayConstants.h"
 #include "axp192/axp192.h"
@@ -37,7 +37,7 @@ static bool initSpi2() {
         .data7_io_num = GPIO_NUM_NC,
         .max_transfer_sz = CORE2_LCD_DRAW_BUFFER_SIZE,
         .flags = 0,
-        .isr_cpu_id = INTR_CPU_ID_AUTO,
+        .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
         .intr_flags = 0
     };
 
diff --git a/Boards/M5stackCoreS3/Source/InitBoot.cpp b/Boards/M5stackCoreS3/Source/InitBoot.cpp
@@ -1,6 +1,6 @@
 #include <driver/i2c.h>
 #include <driver/spi_master.h>
-#include <intr_types.h>
+#include <esp_intr_types.h>
 #include "Log.h"
 #include "hal/CoreS3DisplayConstants.h"
 #include "kernel/Kernel.h"
@@ -28,9 +28,10 @@ static bool initSpi3() {
         .data5_io_num = GPIO_NUM_NC,
         .data6_io_num = GPIO_NUM_NC,
         .data7_io_num = GPIO_NUM_NC,
+        .data_io_default_level = false,
         .max_transfer_sz = CORES3_LCD_DRAW_BUFFER_SIZE,
         .flags = 0,
-        .isr_cpu_id = INTR_CPU_ID_AUTO,
+        .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
         .intr_flags = 0
     };
 
diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp
@@ -29,6 +29,8 @@ bool CoreS3Display::start() {
         .user_ctx = nullptr,
         .lcd_cmd_bits = 8,
         .lcd_param_bits = 8,
+        .cs_ena_pretrans = 0,
+        .cs_ena_posttrans = 0,
         .flags = {
             .dc_high_on_cmd = 0,
             .dc_low_on_data = 0,
diff --git a/Boards/UnPhone/Source/InitHardware.cpp b/Boards/UnPhone/Source/InitHardware.cpp
@@ -27,6 +27,7 @@ static bool initSpi() {
         .data5_io_num = 0,
         .data6_io_num = 0,
         .data7_io_num = 0,
+        .data_io_default_level = false,
         .max_transfer_sz = UNPHONE_SPI_TRANSFER_SIZE_LIMIT,
         .flags = 0,
         .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
diff --git a/Boards/UnPhone/Source/hx8357/disp_spi.c b/Boards/UnPhone/Source/hx8357/disp_spi.c
@@ -87,7 +87,7 @@
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-static void IRAM_ATTR spi_ready (spi_transaction_t *trans);
+static void spi_ready(spi_transaction_t*trans);
 
 /**********************
  *  STATIC VARIABLES
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ If you implemented a board yourself, I'm willing to refer to your implementation
 
 ### Anything that doesn't fall in the above categories?
 
-Please [contact me](https://tactility.one/#/support)a me first!
+Please [contact me](https://tactility.one/#/support) me first!
 
 ## Pull Requests
 
diff --git a/Libraries/QRCode/src/qrcode.c b/Libraries/QRCode/src/qrcode.c
@@ -848,20 +848,10 @@ int8_t qrcode_initText(QRCode *qrcode, uint8_t *modules, uint8_t version, uint8_
 }
 
 bool qrcode_getModule(QRCode *qrcode, uint8_t x, uint8_t y) {
-    if (x < 0 || x >= qrcode->size || y < 0 || y >= qrcode->size) {
+    if (x >= qrcode->size || y >= qrcode->size) {
         return false;
     }
 
     uint32_t offset = y * qrcode->size + x;
     return (qrcode->modules[offset >> 3] & (1 << (7 - (offset & 0x07)))) != 0;
 }
-
-/*
-uint8_t qrcode_getHexLength(QRCode *qrcode) {
-    return ((qrcode->size * qrcode->size) + 7) / 4;
-}
-
-void qrcode_getHex(QRCode *qrcode, char *result) {
-    
-}
-*/
diff --git a/Tactility/Source/app/AppCompatC.h b/Tactility/Source/app/AppCompatC.h
diff --git a/Tactility/Source/app/ElfApp.cpp b/Tactility/Source/app/ElfApp.cpp
@@ -9,6 +9,7 @@
 #include "service/loader/Loader.h"
 
 #include <string>
+#include <utility>
 
 namespace tt::app {
 
@@ -19,13 +20,13 @@ struct ElfManifest {
     std::string name;
     /** Optional icon. */
     std::string icon;
-    CreateData _Nullable createData;
-    DestroyData _Nullable destroyData;
-    OnStart _Nullable onStart;
-    OnStop _Nullable onStop;
-    OnShow _Nullable onShow;
-    OnHide _Nullable onHide;
-    OnResult _Nullable onResult;
+    CreateData _Nullable createData = nullptr;
+    DestroyData _Nullable destroyData = nullptr;
+    OnStart _Nullable onStart = nullptr;
+    OnStop _Nullable onStop = nullptr;
+    OnShow _Nullable onShow = nullptr;
+    OnHide _Nullable onHide = nullptr;
+    OnResult _Nullable onResult = nullptr;
 };
 
 static size_t elfManifestSetCount = 0;
@@ -88,7 +89,7 @@ class ElfApp : public App {
 
 public:
 
-    explicit ElfApp(const std::string& filePath) : filePath(filePath) {}
+    explicit ElfApp(std::string filePath) : filePath(std::move(filePath)) {}
 
     void onStart(AppContext& appContext) override {
         auto initial_count = elfManifestSetCount;
@@ -101,7 +102,7 @@ class ElfApp : public App {
                 }
 
                 if (manifest->onStart != nullptr) {
-                    manifest->onStart(appContext, data);
+                    manifest->onStart(&appContext, data);
                 }
             }
         } else {
@@ -113,7 +114,7 @@ class ElfApp : public App {
         TT_LOG_I(TAG, "Cleaning up app");
         if (manifest != nullptr) {
             if (manifest->onStop != nullptr) {
-                manifest->onStop(appContext, data);
+                manifest->onStop(&appContext, data);
             }
 
             if (manifest->destroyData != nullptr && data != nullptr) {
@@ -127,19 +128,19 @@ class ElfApp : public App {
 
     void onShow(AppContext& appContext, lv_obj_t* parent) override {
         if (manifest != nullptr && manifest->onShow != nullptr) {
-            manifest->onShow(appContext, data, parent);
+            manifest->onShow(&appContext, data, parent);
         }
     }
 
     void onHide(AppContext& appContext) override {
         if (manifest != nullptr && manifest->onHide != nullptr) {
-            manifest->onHide(appContext, data);
+            manifest->onHide(&appContext, data);
         }
     }
 
     void onResult(AppContext& appContext, Result result, std::unique_ptr<Bundle> resultBundle) override {
         if (manifest != nullptr && manifest->onResult != nullptr) {
-            manifest->onResult(appContext, data, result, std::move(resultBundle));
+            manifest->onResult(&appContext, data, result, resultBundle.get());
         }
     }
 };
diff --git a/Tactility/Source/app/ElfApp.h b/Tactility/Source/app/ElfApp.h
@@ -1,12 +1,19 @@
 #pragma once
 
-#include "AppCompatC.h"
 #include "AppManifest.h"
 
 #ifdef ESP_PLATFORM
 
 namespace tt::app {
 
+typedef void* (*CreateData)();
+typedef void (*DestroyData)(void* data);
+typedef void (*OnStart)(void* appContext, void* _Nullable data);
+typedef void (*OnStop)(void* appContext, void* _Nullable data);
+typedef void (*OnShow)(void* appContext, void* _Nullable data, lv_obj_t* parent);
+typedef void (*OnHide)(void* appContext, void* _Nullable data);
+typedef void (*OnResult)(void* appContext, void* _Nullable data, Result result, Bundle* resultData);
+
 void setElfAppManifest(
     const char* name,
     const char* _Nullable icon,
diff --git a/Tactility/Source/app/power/Power.cpp b/Tactility/Source/app/power/Power.cpp
@@ -13,7 +13,6 @@ namespace tt::app::power {
 #define TAG "power"
 
 extern const AppManifest manifest;
-static void onTimer(TT_UNUSED std::shared_ptr<void> context);
 
 class PowerApp;
 
diff --git a/Tactility/Source/app/textviewer/TextViewer.h b/Tactility/Source/app/textviewer/TextViewer.h
diff --git a/Tactility/Source/service/gui/Gui.cpp b/Tactility/Source/service/gui/Gui.cpp
diff --git a/Tactility/Source/service/loader/Loader.cpp b/Tactility/Source/service/loader/Loader.cpp
diff --git a/TactilityC/Source/tt_app_manifest.cpp b/TactilityC/Source/tt_app_manifest.cpp
diff --git a/TactilityCore/Source/Dispatcher.cpp b/TactilityCore/Source/Dispatcher.cpp
diff --git a/TactilityCore/Source/Dispatcher.h b/TactilityCore/Source/Dispatcher.h
diff --git a/TactilityHeadless/Source/service/wifi/WifiEsp.cpp b/TactilityHeadless/Source/service/wifi/WifiEsp.cpp

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ static bool setBacklight(uint8_t duty) {`
`44`	`44`	`.timer_sel = TWODOTFOUR_LCD_BACKLIGHT_LEDC_TIMER,`
`45`	`45`	`.duty = duty,`
`46`	`46`	`.hpoint = 0,`
	`47`	`+ .sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,`
`47`	`48`	`.flags = {`
`48`	`49`	`.output_invert = false`
`49`	`50`	`}`