From 955abacef7a61c7d37a84200e7b63efbbd825543 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Wed, 7 Aug 2024 15:56:30 +0800 Subject: [PATCH 1/4] Added variant for Waveshare ESP32-S3-Touch-LCD-1.69 & ESP32-S3-LCD-1.69 board --- boards/waveshare_esp32-s3-lcd-1_69 | 47 ++++++++++++++++++++++++ boards/waveshare_esp32-s3-touch-lcd-1_69 | 47 ++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 boards/waveshare_esp32-s3-lcd-1_69 create mode 100644 boards/waveshare_esp32-s3-touch-lcd-1_69 diff --git a/boards/waveshare_esp32-s3-lcd-1_69 b/boards/waveshare_esp32-s3-lcd-1_69 new file mode 100644 index 000000000..7238aa80e --- /dev/null +++ b/boards/waveshare_esp32-s3-lcd-1_69 @@ -0,0 +1,47 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32_S3_LCD_1_69", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x8221" + ] + ], + "mcu": "esp32s3", + "variant": "waveshare_esp32_s3_lcd_169" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ESP32-S3-LCD-1.69", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://www.waveshare.com/wiki/ESP32-S3-LCD-1.69", + "vendor": "Waveshare" +} diff --git a/boards/waveshare_esp32-s3-touch-lcd-1_69 b/boards/waveshare_esp32-s3-touch-lcd-1_69 new file mode 100644 index 000000000..81e5f4140 --- /dev/null +++ b/boards/waveshare_esp32-s3-touch-lcd-1_69 @@ -0,0 +1,47 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32_S3_TOUCH_LCD_1_69", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x822e" + ] + ], + "mcu": "esp32s3", + "variant": "waveshare_esp32_s3_touch_lcd_169" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ESP32-S3-Touch-LCD-1.69", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-1.69", + "vendor": "Waveshare" +} From 299eb5fdf337a3aa466ddc49c36d241ac3edb684 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Wed, 7 Aug 2024 15:58:07 +0800 Subject: [PATCH 2/4] fixed waveshare_esp32_s3_touch_lcd_169 arduino pid --- boards/waveshare_esp32-s3-touch-lcd-1_69 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/waveshare_esp32-s3-touch-lcd-1_69 b/boards/waveshare_esp32-s3-touch-lcd-1_69 index 81e5f4140..0ef1547ff 100644 --- a/boards/waveshare_esp32-s3-touch-lcd-1_69 +++ b/boards/waveshare_esp32-s3-touch-lcd-1_69 @@ -17,7 +17,7 @@ "hwids": [ [ "0x303A", - "0x822e" + "0x821e" ] ], "mcu": "esp32s3", From 03d2db022ac8840aaf61e40e74c50d0152944030 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 15:02:08 +0800 Subject: [PATCH 3/4] fixed waveshare_esp32_s3_touch_lcd_169 waveshare_esp32_s3_lcd_169 bugs, Added variant for Waveshare ESP32-S3-Zero --- boards/waveshare-esp32-s3-zero.json | 47 +++++++++++++++++++ ...-1_69 => waveshare_esp32-s3-lcd-1_69.json} | 2 +- ...=> waveshare_esp32-s3-touch-lcd-1_69.json} | 2 +- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 boards/waveshare-esp32-s3-zero.json rename boards/{waveshare_esp32-s3-lcd-1_69 => waveshare_esp32-s3-lcd-1_69.json} (95%) rename boards/{waveshare_esp32-s3-touch-lcd-1_69 => waveshare_esp32-s3-touch-lcd-1_69.json} (95%) diff --git a/boards/waveshare-esp32-s3-zero.json b/boards/waveshare-esp32-s3-zero.json new file mode 100644 index 000000000..9e48bd498 --- /dev/null +++ b/boards/waveshare-esp32-s3-zero.json @@ -0,0 +1,47 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_qspi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32_S3_ZERO", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x822B" + ] + ], + "mcu": "esp32s3", + "variant": "waveshare_esp32_s3_zero" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "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": 921600 + }, + "url": "https://www.waveshare.com/wiki/ESP32-S3-Zero", + "vendor": "Waveshare" +} diff --git a/boards/waveshare_esp32-s3-lcd-1_69 b/boards/waveshare_esp32-s3-lcd-1_69.json similarity index 95% rename from boards/waveshare_esp32-s3-lcd-1_69 rename to boards/waveshare_esp32-s3-lcd-1_69.json index 7238aa80e..bbb89820b 100644 --- a/boards/waveshare_esp32-s3-lcd-1_69 +++ b/boards/waveshare_esp32-s3-lcd-1_69.json @@ -34,7 +34,7 @@ "arduino", "espidf" ], - "name": "ESP32-S3-LCD-1.69", + "name": "Waveshare ESP32-S3-LCD-1.69", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, diff --git a/boards/waveshare_esp32-s3-touch-lcd-1_69 b/boards/waveshare_esp32-s3-touch-lcd-1_69.json similarity index 95% rename from boards/waveshare_esp32-s3-touch-lcd-1_69 rename to boards/waveshare_esp32-s3-touch-lcd-1_69.json index 0ef1547ff..ea4ceefba 100644 --- a/boards/waveshare_esp32-s3-touch-lcd-1_69 +++ b/boards/waveshare_esp32-s3-touch-lcd-1_69.json @@ -34,7 +34,7 @@ "arduino", "espidf" ], - "name": "ESP32-S3-Touch-LCD-1.69", + "name": "Waveshare ESP32-S3-Touch-LCD-1.69", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, From cefd9d95ede1d6cf24b731bfb28d99514703b28d Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Tue, 27 Aug 2024 09:02:55 +0800 Subject: [PATCH 4/4] Modify the Waveshare ESP32-S3-Zero, ESP32-S3-Touch-LCD-1.69, and ESP32-S3-LCD-1.69 definitions --- boards/waveshare-esp32-s3-zero.json | 6 ++++-- boards/waveshare_esp32-s3-lcd-1_69.json | 6 ++++-- boards/waveshare_esp32-s3-touch-lcd-1_69.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/boards/waveshare-esp32-s3-zero.json b/boards/waveshare-esp32-s3-zero.json index 9e48bd498..824c3a493 100644 --- a/boards/waveshare-esp32-s3-zero.json +++ b/boards/waveshare-esp32-s3-zero.json @@ -7,9 +7,11 @@ "core": "esp32", "extra_flags": [ "-DBOARD_HAS_PSRAM", - "-DARDUINO_ESP32_S3_ZERO", + "-DARDUINO_WAVESHARE_ESP32_S3_ZERO", "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/boards/waveshare_esp32-s3-lcd-1_69.json b/boards/waveshare_esp32-s3-lcd-1_69.json index bbb89820b..50d87a125 100644 --- a/boards/waveshare_esp32-s3-lcd-1_69.json +++ b/boards/waveshare_esp32-s3-lcd-1_69.json @@ -7,9 +7,11 @@ "core": "esp32", "extra_flags": [ "-DBOARD_HAS_PSRAM", - "-DARDUINO_ESP32_S3_LCD_1_69", + "-DARDUINO_WAVESHARE_ESP32_S3_LCD_1_69", "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/boards/waveshare_esp32-s3-touch-lcd-1_69.json b/boards/waveshare_esp32-s3-touch-lcd-1_69.json index ea4ceefba..3ed27d5a7 100644 --- a/boards/waveshare_esp32-s3-touch-lcd-1_69.json +++ b/boards/waveshare_esp32-s3-touch-lcd-1_69.json @@ -7,9 +7,11 @@ "core": "esp32", "extra_flags": [ "-DBOARD_HAS_PSRAM", - "-DARDUINO_ESP32_S3_TOUCH_LCD_1_69", + "-DARDUINO_WAVESHARE_ESP32_S3_TOUCH_LCD_1_69", "-DARDUINO_USB_MODE=1", - "-DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" ], "f_cpu": "240000000L", "f_flash": "80000000L",