ESP-IDF 5.2 (#49)

- Updated IDF from 5.1.2 to 5.2
- Updated FreeRTOS from 10.4.6 to 10.5.1
- Updated M5GFX with bugfix for IDF 5.2
- FreeRTOS-Kernel is now a submodule

.github/workflows/esp.yml

@@ -13,7 +13,7 @@ jobs:
       - name: build
         uses: espressif/esp-idf-ci-action@main
         with:
-          esp_idf_version: v5.1.2
+          esp_idf_version: v5.2
           target: esp32
           path: './'
   build-lilygo-t-deck:
@@ -28,7 +28,7 @@ jobs:
       - name: build
         uses: espressif/esp-idf-ci-action@main
         with:
-          esp_idf_version: v5.1.2
+          esp_idf_version: v5.2
           target: esp32s3
           path: './'
   build-waveshare-s3-touch:
@@ -43,7 +43,7 @@ jobs:
       - name: build
         uses: espressif/esp-idf-ci-action@main
         with:
-          esp_idf_version: v5.1.2
+          esp_idf_version: v5.2
           target: esp32s3
           path: './'
   build-m5stack-core2:
@@ -58,6 +58,6 @@ jobs:
       - name: build
         uses: espressif/esp-idf-ci-action@main
         with:
-          esp_idf_version: v5.1.2
+          esp_idf_version: v5.2
           target: esp32
           path: './'

.gitmodules

@@ -1,6 +1,11 @@
 [submodule "libs/M5GFX"]
 	path = libs/M5GFX
-	url = https://github.com/m5stack/M5GFX.git
+	url = https://github.com/KenVanHoeylandt/M5GFX.git
+	branch = develop
 [submodule "libs/M5Unified"]
 	path = libs/M5Unified
 	url = https://github.com/m5stack/M5Unified.git
+[submodule "libs/freertos-kernel"]
+	path = libs/freertos-kernel
+	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+	branch = V10.5.1

CMakeLists.txt

@@ -47,6 +47,8 @@ add_subdirectory(libs/mlib)
 add_subdirectory(libs/lv_screenshot)
 
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
+    set(FREERTOS_CONFIG_FILE_DIRECTORY "${PROJECT_SOURCE_DIR}/app-sim/src" CACHE STRING "")
+    set(FREERTOS_PORT GCC_IA32_FLAT CACHE STRING "")
     add_subdirectory(libs/freertos-kernel)
     target_include_directories(freertos-kernel
         PUBLIC app-sim/src # for FreeRTOSConfig.h
@@ -60,18 +62,17 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(tests)
 
     # region SDL & LVGL
+    set(LV_CONF_PATH ${PROJECT_SOURCE_DIR}/app-sim/src/lv_conf.h)
+    add_subdirectory(libs/lvgl) # Added as idf component for ESP and as library for other targets
+    target_include_directories(lvgl
+        PUBLIC app-sim/src # for lv_conf.h and lv_drv_conf.h
+    )
 
     # TODO: This is a temporary skipping option for running unit tests
     # TODO: Remove when github action for SDL is working again
     if (NOT DEFINED ENV{SKIP_SDL})
         find_package(SDL2 REQUIRED CONFIG)
 
-        add_subdirectory(libs/lvgl) # Added as idf component for ESP and as library for other targets
-        target_include_directories(lvgl
-            PUBLIC ${SDL2_INCLUDE_DIRS}
-            PUBLIC app-sim/src # for lv_conf.h and lv_drv_conf.h
-        )
-
         option(LV_USE_DRAW_SDL "Use SDL draw unit" OFF)
         option(LV_USE_LIBPNG "Use libpng to decode PNG" OFF)
         option(LV_USE_LIBJPEG_TURBO "Use libjpeg turbo to decode JPEG" OFF)

README.md

@@ -27,7 +27,7 @@ Noteworthy features:
 
 Requirements:
 - ESP32 (any?) with a touchscreen
-- [esp-idf 5.1.2](https://docs.espressif.com/projects/esp-idf/en/v5.1.2/esp32/get-started/index.html) or a newer v5.1.x
+- [esp-idf 5.2](https://docs.espressif.com/projects/esp-idf/en/v5.2/esp32/get-started/index.html) or a newer v5.2.x
 
 ## Making apps is easy!
 
@@ -104,7 +104,7 @@ git clone --recurse-submodules -j8 https://github.com/ByteWelder/Tactility.git
 
 ### Build environment setup
 
-Ensure you have [esp-idf 5.1.2](https://docs.espressif.com/projects/esp-idf/en/v5.1.2/esp32/get-started/index.html) installed, then select the correct device:
+Ensure you have [esp-idf 5.2](https://docs.espressif.com/projects/esp-idf/en/v5.2/esp32/get-started/index.html) installed, then select the correct device:
 
 Copy the `sdkconfig.board.YOUR_BOARD` into `sdkconfig`. Use `sdkconfig.defaults` if you are setting up a custom board.
 

app-esp/idf_component.yml

@@ -3,4 +3,4 @@ dependencies:
   espressif/esp_lcd_touch_cst816s: "^1.0.3"
   espressif/esp_lcd_touch_gt911: "^1.0.0"
   espressif/esp_lcd_touch: "1.1.1"
-  idf: '~5.1.2'
+  idf: '~5.2'

boards/m5stack_core2/source/bootstrap.cpp

@@ -58,7 +58,7 @@ static bool init_spi2() {
         .data7_io_num = GPIO_NUM_NC,
         .max_transfer_sz = CORE2_SPI2_TRANSACTION_LIMIT,
         .flags = 0,
-        .isr_cpu_id = INTR_CPU_ID_AUTO,
+        .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
         .intr_flags = 0
     };
 

libs/M5GFX

@@ -1 +1 @@
-Subproject commit 33d7d3135e816a86a008fae8ab3757938cee95d2
+Subproject commit ba17bdf930bca03725e0c976927e15146d1daa2f

sdkconfig.board.lilygo_tdeck

@@ -11,6 +11,8 @@ CONFIG_LV_USE_BUILTIN_MALLOC=n
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

sdkconfig.board.m5stack_core2

@@ -11,6 +11,8 @@ CONFIG_LV_USE_BUILTIN_MALLOC=n
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

sdkconfig.board.waveshare_s3_touch

@@ -11,6 +11,8 @@ CONFIG_LV_USE_BUILTIN_MALLOC=n
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

sdkconfig.board.yellow_board

@@ -11,6 +11,8 @@ CONFIG_LV_USE_BUILTIN_MALLOC=n
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

sdkconfig.defaults

@@ -11,6 +11,8 @@ CONFIG_LV_USE_BUILTIN_MALLOC=n
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"