From 5156766e73bd3bd83c4fe687cf9d2e13cacc07f9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:54:05 +0100 Subject: [PATCH] Arduino espressif32 core 3.1.1 --- boards/adafruit_qualia_s3_rgb666.json | 3 +- boards/huidu_hd_wf2.json | 55 +++++++++++++++++++++++++ boards/huidu_hd_wf4.json | 55 +++++++++++++++++++++++++ boards/jczn_2432s028r.json | 32 ++++++++++++++ boards/lilygo-t3-s3.json | 42 +++++++++++++++++++ boards/sparkfun_esp32s3_thing_plus.json | 52 +++++++++++++++++++++++ boards/waveshare_esp32_s3_zero.json | 41 ++++++++++++++++++ boards/ws_esp32_s3_matrix.json | 32 ++++++++++++++ builder/frameworks/espidf.py | 8 +++- 9 files changed, 317 insertions(+), 3 deletions(-) create mode 100644 boards/huidu_hd_wf2.json create mode 100644 boards/huidu_hd_wf4.json create mode 100644 boards/jczn_2432s028r.json create mode 100644 boards/lilygo-t3-s3.json create mode 100644 boards/sparkfun_esp32s3_thing_plus.json create mode 100644 boards/waveshare_esp32_s3_zero.json create mode 100644 boards/ws_esp32_s3_matrix.json diff --git a/boards/adafruit_qualia_s3_rgb666.json b/boards/adafruit_qualia_s3_rgb666.json index e1607a9..c122ae7 100644 --- a/boards/adafruit_qualia_s3_rgb666.json +++ b/boards/adafruit_qualia_s3_rgb666.json @@ -1,9 +1,8 @@ { "build": { "arduino":{ - "ldscript": "esp32s3_out.ld", "memory_type": "qio_opi", - "partitions": "partitions-16MB-tinyuf2.csv" + "partitions": "tinyuf2-partitions-16MB.csv" }, "core": "esp32", "extra_flags": [ diff --git a/boards/huidu_hd_wf2.json b/boards/huidu_hd_wf2.json new file mode 100644 index 0000000..eecb9d6 --- /dev/null +++ b/boards/huidu_hd_wf2.json @@ -0,0 +1,55 @@ +{ + "build": { + "arduino": { + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_HUIDU_HD_WF2", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "huidu_hd_wf2" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Huidu HD-WF2", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.hdwell.com/Product/index46.html", + "vendor": "Huidu Tech", + "information_urls": [ + "https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA/discussions/667", + "https://github.com/vortigont/FireLamp_JeeUI/wiki/Huidu-HD%E2%80%90WF2" + ] +} diff --git a/boards/huidu_hd_wf4.json b/boards/huidu_hd_wf4.json new file mode 100644 index 0000000..b0acdff --- /dev/null +++ b/boards/huidu_hd_wf4.json @@ -0,0 +1,55 @@ +{ + "build": { + "arduino": { + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_HUIDU_HD_WF4", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "huidu_hd_wf4" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Huidu HD-WF4", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.hdwell.com/Product/index46.html", + "vendor": "Huidu Tech", + "information_urls": [ + "https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA/discussions/667", + "https://github.com/vortigont/FireLamp_JeeUI/wiki/Huidu-HD%E2%80%90WF4" + ] +} diff --git a/boards/jczn_2432s028r.json b/boards/jczn_2432s028r.json new file mode 100644 index 0000000..b5c10fa --- /dev/null +++ b/boards/jczn_2432s028r.json @@ -0,0 +1,32 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_JCZN_2432S028R", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "qio", + "mcu": "esp32", + "variant": "jczn_2432s028r" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ESP32-2432S028R CYD", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "http://pan.jczn1688.com/directlink/1/ESP32%20module/2.8inch_ESP32-2432S028R.rar", + "vendor": "JCZN" +} diff --git a/boards/lilygo-t3-s3.json b/boards/lilygo-t3-s3.json new file mode 100644 index 0000000..6a00b6f --- /dev/null +++ b/boards/lilygo-t3-s3.json @@ -0,0 +1,42 @@ +{ + "build": { + "arduino": { + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_LILYGO_T3_S3_V1_X", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DARDUINO_USB_MODE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32s3", + "variant": "esp32s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "LilyGo T3-S3", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://lilygo.cc/products/t3s3-v1-0", + "vendor": "LilyGo" +} diff --git a/boards/sparkfun_esp32s3_thing_plus.json b/boards/sparkfun_esp32s3_thing_plus.json new file mode 100644 index 0000000..5dcaefb --- /dev/null +++ b/boards/sparkfun_esp32s3_thing_plus.json @@ -0,0 +1,52 @@ +{ + "build": { + "arduino": { + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "sparkfun_esp32s3_thing_plus" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "SPARKFUN_ESP32S3_THING_PLUS", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.sparkfun.com/products/24408", + "vendor": "SparkFun" +} diff --git a/boards/waveshare_esp32_s3_zero.json b/boards/waveshare_esp32_s3_zero.json new file mode 100644 index 0000000..5965e45 --- /dev/null +++ b/boards/waveshare_esp32_s3_zero.json @@ -0,0 +1,41 @@ +{ + "build": { + "arduino":{ + "memory_type": "qio_qspi" + }, + "core": "esp32", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32s3", + "variant": "waveshare_esp32_s3_zero", + "extra_flags": [ + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1", + "-DBOARD_HAS_PSRAM" + ] + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Waveshare ESP32-S3-Zero", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.waveshare.com/wiki/ESP32-S3-Zero", + "vendor": "Waveshare" +} diff --git a/boards/ws_esp32_s3_matrix.json b/boards/ws_esp32_s3_matrix.json new file mode 100644 index 0000000..d116bc5 --- /dev/null +++ b/boards/ws_esp32_s3_matrix.json @@ -0,0 +1,32 @@ +{ + "build": { + "core": "esp32", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "memory_type": "qio_qspi", + "mcu": "esp32s3", + "variant": "ws_esp32_s3_matrix" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Waveshare ESP32-S3-Matrix", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.waveshare.com/wiki/ESP32-S3-Matrix", + "vendor": "Waveshare" +} diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index d9b2c33..a1ff9c2 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -405,13 +405,15 @@ def is_cmake_reconfigure_required(cmake_api_reply_dir): ] cmake_preconf_dir = os.path.join(BUILD_DIR, "config") deafult_sdk_config = os.path.join(PROJECT_DIR, "sdkconfig.defaults") + idf_deps_lock = os.path.join(PROJECT_DIR, "dependencies.lock") + ninja_buildfile = os.path.join(BUILD_DIR, "build.ninja") for d in (cmake_api_reply_dir, cmake_preconf_dir): if not os.path.isdir(d) or not os.listdir(d): return True if not os.path.isfile(cmake_cache_file): return True - if not os.path.isfile(os.path.join(BUILD_DIR, "build.ninja")): + if not os.path.isfile(ninja_buildfile): return True if not os.path.isfile(SDKCONFIG_PATH) or os.path.getmtime( SDKCONFIG_PATH @@ -421,6 +423,10 @@ def is_cmake_reconfigure_required(cmake_api_reply_dir): deafult_sdk_config ) > os.path.getmtime(cmake_cache_file): return True + if os.path.isfile(idf_deps_lock) and os.path.getmtime( + idf_deps_lock + ) > os.path.getmtime(ninja_buildfile): + return True if any( os.path.getmtime(f) > os.path.getmtime(cmake_cache_file) for f in cmake_txt_files + [cmake_preconf_dir, FRAMEWORK_DIR]