From 8bbf6fd475f8b8b893433260358429d40a09531c Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:33:25 +0200 Subject: [PATCH 1/6] [6] add LilyGo T-CameraPlus S3 support, us BOARD_HAS_PSRAM flag from board config if available, chore --- boards/LilyGo-T-CameraPlus-ESP32-S3.json | 56 ++++++++++++++++++++++++ boards/LilyGo-T-Display-S3-long.json | 11 ++--- boards/LilyGo-T-Watch-S3.json | 9 ++-- boards/esp32-c6-n16.json | 7 +-- boards/esp32-c6-n4.json | 3 +- platformio.ini | 15 +++++-- 6 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 boards/LilyGo-T-CameraPlus-ESP32-S3.json diff --git a/boards/LilyGo-T-CameraPlus-ESP32-S3.json b/boards/LilyGo-T-CameraPlus-ESP32-S3.json new file mode 100644 index 0000000..4074d14 --- /dev/null +++ b/boards/LilyGo-T-CameraPlus-ESP32-S3.json @@ -0,0 +1,56 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi", + "partitions": "default_16MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-D ARDUINO_LILYGO_T_CAMERAPLUS_S3", + "-D ARDUINO_USB_MODE=1", + "-D ARDUINO_USB_CDC_ON_BOOT=1", + "-D BOARD_HAS_PSRAM=1", + "-D ARDUINO_RUNNING_CORE=1", + "-D ARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x83CF" + ], + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "esp32s3" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": ["esp-builtin"], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "LILYGO T-CameraPlus ESP32-S3 (16M Flash 8M PSRAM)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://www.lilygo.cc/products/t-camera-plus-s3", + "vendor": "LilyGo" +} \ No newline at end of file diff --git a/boards/LilyGo-T-Display-S3-long.json b/boards/LilyGo-T-Display-S3-long.json index 0fc61e7..7359eb2 100644 --- a/boards/LilyGo-T-Display-S3-long.json +++ b/boards/LilyGo-T-Display-S3-long.json @@ -7,11 +7,12 @@ }, "core": "esp32", "extra_flags": [ - "-DARDUINO_ESP32S3_DEV", - "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1", - "-DARDUINO_RUNNING_CORE=1", - "-DARDUINO_EVENT_RUNNING_CORE=1" + "-D ARDUINO_ESP32S3_DEV", + "-D ARDUINO_USB_MODE=1", + "-D ARDUINO_USB_CDC_ON_BOOT=1", + "-D BOARD_HAS_PSRAM=1", + "-D ARDUINO_RUNNING_CORE=1", + "-D ARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/boards/LilyGo-T-Watch-S3.json b/boards/LilyGo-T-Watch-S3.json index a28bf11..e69cd0f 100644 --- a/boards/LilyGo-T-Watch-S3.json +++ b/boards/LilyGo-T-Watch-S3.json @@ -7,10 +7,11 @@ }, "core": "esp32", "extra_flags": [ - "-DARDUINO_TWATCH_S3", - "-DARDUINO_USB_MODE=1", - "-DARDUINO_RUNNING_CORE=1", - "-DARDUINO_EVENT_RUNNING_CORE=1" + "-D ARDUINO_TWATCH_S3", + "-D ARDUINO_USB_MODE=1", + "-D BOARD_HAS_PSRAM=1", + "-D ARDUINO_RUNNING_CORE=1", + "-D ARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/boards/esp32-c6-n16.json b/boards/esp32-c6-n16.json index 287f5e4..a73848d 100644 --- a/boards/esp32-c6-n16.json +++ b/boards/esp32-c6-n16.json @@ -7,9 +7,10 @@ "mcu": "esp32c6", "variant": "esp32c6", "extra_flags": [ - "-DARDUINO_ESP32S3_DEV", - "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-D ARDUINO_ESP32S3_DEV", + "-D ARDUINO_USB_MODE=1", + "-D ARDUINO_USB_CDC_ON_BOOT=1", + "-D BOARD_HAS_PSRAM=1" ] }, "connectivity": [ diff --git a/boards/esp32-c6-n4.json b/boards/esp32-c6-n4.json index 3fa7cf5..46da5ba 100644 --- a/boards/esp32-c6-n4.json +++ b/boards/esp32-c6-n4.json @@ -9,7 +9,8 @@ "extra_flags": [ "-DARDUINO_ESP32C6_DEV", "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-D BOARD_HAS_PSRAM=1" ] }, "connectivity": [ diff --git a/platformio.ini b/platformio.ini index def7bf9..473b38e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -36,7 +36,7 @@ upload_speed = 921600 [extra] ; https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/external-ram.html build_flags_psram = - -DBOARD_HAS_PSRAM + -DBOARD_HAS_PSRAM=1 -mfix-esp32-psram-cache-issue ; https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/external-ram.html#esp32-rev-v1 lib_deps_builtin = SPI @@ -195,7 +195,6 @@ board = LilyGo-T-Display-S3-long board_build.partitions = huge_app.csv build_flags = ${esp32s3.build_flags} - ${extra.build_flags_psram} ; 8MB PSRAM lib_deps = ${esp32s3.lib_deps} @@ -217,6 +216,16 @@ board = LilyGo-T-Watch-S3 board_build.partitions = huge_app.csv build_flags = ${esp32s3.build_flags} - ${extra.build_flags_psram} ; 8MB PSRAM lib_deps = ${esp32s3.lib_deps} + +; LILYGO: https://www.lilygo.cc/products/t-camera-plus-s3 +; repository: https://github.com/Xinyuan-LilyGO/T-CameraPlus-S3 +; Buy and support mcuw on aliexpress (affiliate link): https://s.click.aliexpress.com/e/_DkytBeT +[env:lilygo-t-cameraplus-s3] +board = LilyGo-T-CameraPlus-ESP32-S3 +board_build.partitions = huge_app.csv +build_flags = + ${esp32s3.build_flags} +lib_deps = + ${esp32s3.lib_deps} \ No newline at end of file From 307bd0ab57cd400e097a321063b78bf4756f630d Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:00:35 +0200 Subject: [PATCH 2/6] upgrade platformio 6.1.23->6.1.15, ignore build.yaml action for the main branch, run build_release.yml action only for the main branch --- .github/workflows/build.yml | 5 +++-- .github/workflows/build_release.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f6c4f1..40ad5bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,8 @@ on: tags-ignore: - "**" pull_request: - branches: [main] + branches-ignore: + - main jobs: build: name: Build @@ -17,7 +18,7 @@ jobs: python-version: "3.x" architecture: "x64" - name: Install PlatformIO - run: python3 -m pip install platformio==6.1.13 + run: python3 -m pip install platformio==6.1.15 - name: Build firmwares run: FIRMWARE_VERSION=main platformio run - name: Archive diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 5f17fc5..a0d6205 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -1,9 +1,9 @@ on: push: + branches: + - 'main' tags: - "*" - pull_request: - branches: [main] jobs: build: name: Build @@ -17,7 +17,7 @@ jobs: python-version: "3.x" architecture: "x64" - name: Install PlatformIO - run: python3 -m pip install platformio==6.1.13 + run: python3 -m pip install platformio==6.1.15 - name: Build firmwares run: FIRMWARE_VERSION=${{github.ref_name}} platformio run - name: Archive From fdc9527f30c788356c6844c1ac772b287bad7787 Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:04:12 +0200 Subject: [PATCH 3/6] [6] try fix trigger on all pull request except for main branch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40ad5bb..b05a7f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,7 @@ on: tags-ignore: - "**" pull_request: + branches: branches-ignore: - main jobs: From 2b155ac2d82f0563aa38e39e565ac4eb4f0b7e62 Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:07:15 +0200 Subject: [PATCH 4/6] 6] try fix trigger on all pull request except for main branch v2 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b05a7f3..378e734 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: - "**" pull_request: branches: + - "*" branches-ignore: - main jobs: From 498d045fb270fca685ca7e33f8cebb110f1c9c98 Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:08:36 +0200 Subject: [PATCH 5/6] 6] try fix trigger on all pull request except for main branch v3 --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 378e734..72c4f9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,7 @@ on: tags-ignore: - "**" pull_request: - branches: - - "*" - branches-ignore: - - main + branches: [main] jobs: build: name: Build From f28dee6c168d9d5afb25dc0a43c99a008c9afa41 Mon Sep 17 00:00:00 2001 From: mcuw <112967559+mcuw@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:12:58 +0200 Subject: [PATCH 6/6] [6] update readme for LilyGo-T-CameraPlus-ESP32-S3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf8aa27..c08d75f 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Update the [CHANGELOG.md](CHANGELOG.md) file before you are creating a new relea - ESP32 (buy with affiliate link: [LILYGO T-Beam](https://s.click.aliexpress.com/e/_DBzslDV) with LoRA, lolin32, lolin D32 pro) - ESP32 S2 -- ESP32 S3 (buy with affiliate link: [LILYGO T-Display S3](https://s.click.aliexpress.com/e/_DBmOMkn), [LILYGO T-Display-S3 AMOLED](https://s.click.aliexpress.com/e/_DmboYpZ), [LILYGO T-Display-S3 Touch](https://s.click.aliexpress.com/e/_DCBgPlV), [LILYGO T-Display S3 Long](https://s.click.aliexpress.com/e/_Dl6UVMx)), [LilyGo T-Watch S3](https://s.click.aliexpress.com/e/_DEZVvH1) +- ESP32 S3 (buy with affiliate link: [LILYGO T-Display S3](https://s.click.aliexpress.com/e/_DBmOMkn), [LILYGO T-Display-S3 AMOLED](https://s.click.aliexpress.com/e/_DmboYpZ), [LILYGO T-Display-S3 Touch](https://s.click.aliexpress.com/e/_DCBgPlV), [LILYGO T-Display S3 Long](https://s.click.aliexpress.com/e/_Dl6UVMx)), [LilyGo T-Watch S3](https://s.click.aliexpress.com/e/_DEZVvH1), [LilyGo T-CameraPlus ESP32-S3](https://s.click.aliexpress.com/e/_DkytBeT) - ESP32 C6 with WiFi 6 and BT-5 LE (buy with affiliate link: [UICPAL nanoESP32-C6](https://s.click.aliexpress.com/e/_DdZ83IB) with up to 16MB flash, [ESP32-C6](https://s.click.aliexpress.com/e/_DeLjVMb) with 4MB flash and W2812 RGB LED) ## Disclaimer