Fix/m5stack core s3 dependencies (#10)

* switch to noglib version
* fix serial monitor for m5stack
* add target specification to board definition
* update SDL depdendency
* add m5stack back to tests
* fail test in case of reboot

Author: georgik

.github/workflows/test.yml

@@ -13,9 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        board: [esp-box-3, esp-box, esp32_p4_function_ev_board]
-        # M5 Stack CoreS3 - test disabled, because mapping of UART is not working in Wokwi
-        #board: [esp-box-3, esp-box, m5stack_core_s3, esp32_p4_function_ev_board]
+        board: [esp-box-3, esp-box, m5stack_core_s3, esp32_p4_function_ev_board]
       fail-fast: false
 
     steps:
@@ -36,9 +34,9 @@ jobs:
           token: ${{ secrets.WOKWI_CLI_TOKEN }}
           path: boards/${{ matrix.board }}
           elf: build.${{ matrix.board }}/${{ github.event.inputs.prefix }}-${{ matrix.board }}.bin
-          timeout: 30000
+          timeout: 20000
           expect_text: 'Entering main loop...'
-          fail_text: 'Error'
+          fail_text: 'Rebooting...'
           serial_log_file: 'wokwi-logs-${{ matrix.board }}.txt'
 
       - name: Upload Wokwi Logs

README.md

@@ -26,34 +26,33 @@ Working parts:
 
 ## Build
 
-```
+```shell
 git clone [email protected]:georgik/esp32-sdl3-test.git
 cd esp32-sdl3-test
 
-idf.py @boards/esp-box-3.cfg set-target esp32-s3
 idf.py @boards/esp-box-3.cfg build
 ```
 
 ### Other boards
 
 - ESP32-S3-BOX-3
 ```shell
-idf.py @boards/esp-box-3.cfg reconfigure
+idf.py @boards/esp-box-3.cfg build
 ```
 
 - ESP32-S3-BOX (prior Dec. 2023)
 ```shell
-idf.py @boards/esp-box.cfg reconfigure
+idf.py @boards/esp-box.cfg build
 ```
 
 - ESP32-P4
 ```shell
-idf.py @boards/esp32_p4_function_ev_board.cfg reconfigure
+idf.py @boards/esp32_p4_function_ev_board.cfg build
 ```
 
 - M5Stack-CoreS3
 ```shell
-idf.py @boards/m5stack_core_s3.cfg reconfigure
+idf.py @boards/m5stack_core_s3.cfg build
 ```
 
 ## Notes

boards/esp-box-3.cfg

@@ -1 +1 @@
--DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp-box-3;sdkconfig.defaults" -DBUILD_BOARD="esp-box-3" -B build.esp-box-3
+-DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp-box-3;sdkconfig.defaults" -DBUILD_BOARD="esp-box-3" -DIDF_TARGET=esp32s3 -B build.esp-box-3

boards/esp-box.cfg

@@ -1 +1 @@
--DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp-box;sdkconfig.defaults" -DBUILD_BOARD="esp-box" -B build.esp-box
+-DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp-box;sdkconfig.defaults" -DBUILD_BOARD="esp-box" -DIDF_TARGET=esp32s3 -B build.esp-box

boards/esp32_p4_function_ev_board.cfg

@@ -1 +1 @@
--DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp32_p4_function_ev_board;sdkconfig.defaults" -DBUILD_BOARD="esp32_p4_function_ev_board_noglib" -B build.esp32_p4_function_ev_board
+-DSDKCONFIG_DEFAULTS="sdkconfig.defaults.esp32_p4_function_ev_board;sdkconfig.defaults" -DBUILD_BOARD="esp32_p4_function_ev_board_noglib" -DIDF_TARGET=esp32p4 -B build.esp32_p4_function_ev_board

boards/m5stack_core_s3.cfg

@@ -1 +1 @@
--DSDKCONFIG_DEFAULTS="sdkconfig.defaults.m5stack_core_s3;sdkconfig.defaults" -DBUILD_BOARD="m5stack_core_s3" -B build.m5stack_core_s3
+-DSDKCONFIG_DEFAULTS="sdkconfig.defaults.m5stack_core_s3;sdkconfig.defaults" -DBUILD_BOARD="m5stack_core_s3_noglib" -DIDF_TARGET=esp32s3 -B build.m5stack_core_s3

boards/m5stack_core_s3/diagram.json

@@ -3,21 +3,12 @@
   "author": "Uri Shaked",
   "editor": "wokwi",
   "parts": [
-    {
-      "type": "board-m5stack-core-s3",
-      "id": "esp"
-    }
+    { "type": "board-m5stack-core-s3", "id": "esp", "top": 0, "left": 0, "attrs": {} }
   ],
   "connections": [
-    [
-      "esp:TX",
-      "$serialMonitor:RX",
-      ""
-    ],
-    [
-      "esp:RX",
-      "$serialMonitor:TX",
-      ""
-    ]
-  ]
+    [ "esp:G43", "$serialMonitor:RX", "", [] ],
+    [ "esp:G44", "$serialMonitor:TX", "", [] ]
+
+  ],
+  "dependencies": {}
 }

main/idf_component.yml

@@ -4,7 +4,7 @@ dependencies:
   # espressif/freetype: "^2.13.0~3"
   # espressif/esp-box: "^3.1.0~1"
   joltwallet/littlefs: "==1.14.8"
-  georgik/sdl: "^3.1.2~2"
+  georgik/sdl: "^3.1.2~3"
 #    git: https://github.com/georgik/esp-idf-component-SDL.git
   georgik/sdl_image: "^3.0.0~1"
 #    git: https://github.com/georgik/esp-idf-component-SDL_image.git
@@ -20,14 +20,23 @@ dependencies:
     version: "^1.2.0"
     rules:
     - if: "${BUILD_BOARD} == esp-box-3"
+
   espressif/esp-box:
     version: "3.1.0"
     rules:
     - if: "${BUILD_BOARD} == esp-box"
-  espressif/m5stack_core_s3:
-    version: "1.1.1"
+
+  espressif/m5stack_core_s3_noglib:
+    version: "==1.1.1~1"
     rules:
-    - if: "${BUILD_BOARD} == m5stack_core_s3"
+    - if: "${BUILD_BOARD} == m5stack_core_s3_noglib"
+  # Workaround for the conflict of I2C drivers in ESP-IDF 5.3+
+  esp_codec_dev:
+    public: true
+    version: "==1.1.0"
+    rules:
+    - if: "${BUILD_BOARD} == m5stack_core_s3_noglib"
+
   espressif/esp32_p4_function_ev_board_noglib:
     version: "3.0.1"
     rules: