From 1c1ed0fcfe86543c0c854d6cf20517a102bea34f Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 14:42:44 +0800 Subject: [PATCH 1/9] Added variant for ESP32-S3-Zero --- boards.txt | 192 ++++++++++++++++++ .../waveshare_esp32_s3_zero/pins_arduino.h | 71 +++++++ 2 files changed, 263 insertions(+) create mode 100644 variants/waveshare_esp32_s3_zero/pins_arduino.h diff --git a/boards.txt b/boards.txt index 7ea34347dfe..147ea85bd7f 100644 --- a/boards.txt +++ b/boards.txt @@ -38600,6 +38600,198 @@ Geekble_ESP32C3.menu.EraseFlash.none.upload.erase_cmd= Geekble_ESP32C3.menu.EraseFlash.all=Enabled Geekble_ESP32C3.menu.EraseFlash.all.upload.erase_cmd=-e +############################################################## + +waveshare_esp32_s3_zero.name=Waveshare ESP32-S3-Zero +waveshare_esp32_s3_zero.vid.0=0x303a +waveshare_esp32_s3_zero.pid.0=0x822B +waveshare_esp32_s3_zero.upload_port.0.vid=0x303a +waveshare_esp32_s3_zero.upload_port.0.pid=0x822B + +waveshare_esp32_s3_zero.bootloader.tool=esptool_py +waveshare_esp32_s3_zero.bootloader.tool.default=esptool_py + +waveshare_esp32_s3_zero.upload.tool=esptool_py +waveshare_esp32_s3_zero.upload.tool.default=esptool_py +waveshare_esp32_s3_zero.upload.tool.network=esp_ota + +waveshare_esp32_s3_zero.upload.maximum_size=1310720 + +waveshare_esp32_s3_zero.upload.maximum_data_size=327680 +waveshare_esp32_s3_zero.upload.flags= +waveshare_esp32_s3_zero.upload.extra_flags= +waveshare_esp32_s3_zero.upload.use_1200bps_touch=false +waveshare_esp32_s3_zero.upload.wait_for_upload_port=false + +waveshare_esp32_s3_zero.serial.disableDTR=false +waveshare_esp32_s3_zero.serial.disableRTS=false + +waveshare_esp32_s3_zero.build.tarch=xtensa +waveshare_esp32_s3_zero.build.bootloader_addr=0x0 +waveshare_esp32_s3_zero.build.target=esp32s3 +waveshare_esp32_s3_zero.build.mcu=esp32s3 +waveshare_esp32_s3_zero.build.core=esp32 +waveshare_esp32_s3_zero.build.variant=waveshare_esp32_s3_zero +waveshare_esp32_s3_zero.build.board=WAVESHARE_ESP32_S3_ZERO + +waveshare_esp32_s3_zero.build.usb_mode=1 +waveshare_esp32_s3_zero.build.cdc_on_boot=0 +waveshare_esp32_s3_zero.build.msc_on_boot=0 +waveshare_esp32_s3_zero.build.dfu_on_boot=0 +waveshare_esp32_s3_zero.build.f_cpu=240000000L +waveshare_esp32_s3_zero.build.flash_size=4MB +waveshare_esp32_s3_zero.build.flash_freq=80m +waveshare_esp32_s3_zero.build.flash_mode=dio +waveshare_esp32_s3_zero.build.boot=qio +waveshare_esp32_s3_zero.build.boot_freq=80m +waveshare_esp32_s3_zero.build.partitions=default +waveshare_esp32_s3_zero.build.defines= +waveshare_esp32_s3_zero.build.loop_core= +waveshare_esp32_s3_zero.build.event_core= +waveshare_esp32_s3_zero.build.psram_type=qspi +waveshare_esp32_s3_zero.build.memory_type={build.boot}_{build.psram_type} + +waveshare_esp32_s3_zero.menu.PSRAM.disabled=Disabled +waveshare_esp32_s3_zero.menu.PSRAM.disabled.build.defines= +waveshare_esp32_s3_zero.menu.PSRAM.disabled.build.psram_type=qspi +waveshare_esp32_s3_zero.menu.PSRAM.enabled=Enabled +waveshare_esp32_s3_zero.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM +waveshare_esp32_s3_zero.menu.PSRAM.enabled.build.psram_type=qspi + +waveshare_esp32_s3_zero.menu.FlashMode.qio=QIO 80MHz +waveshare_esp32_s3_zero.menu.FlashMode.qio.build.flash_mode=dio +waveshare_esp32_s3_zero.menu.FlashMode.qio.build.boot=qio +waveshare_esp32_s3_zero.menu.FlashMode.qio.build.boot_freq=80m +waveshare_esp32_s3_zero.menu.FlashMode.qio.build.flash_freq=80m +waveshare_esp32_s3_zero.menu.FlashMode.qio120=QIO 120MHz +waveshare_esp32_s3_zero.menu.FlashMode.qio120.build.flash_mode=dio +waveshare_esp32_s3_zero.menu.FlashMode.qio120.build.boot=qio +waveshare_esp32_s3_zero.menu.FlashMode.qio120.build.boot_freq=120m +waveshare_esp32_s3_zero.menu.FlashMode.qio120.build.flash_freq=80m + +waveshare_esp32_s3_zero.menu.LoopCore.1=Core 1 +waveshare_esp32_s3_zero.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +waveshare_esp32_s3_zero.menu.LoopCore.0=Core 0 +waveshare_esp32_s3_zero.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +waveshare_esp32_s3_zero.menu.EventsCore.1=Core 1 +waveshare_esp32_s3_zero.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +waveshare_esp32_s3_zero.menu.EventsCore.0=Core 0 +waveshare_esp32_s3_zero.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + +waveshare_esp32_s3_zero.menu.USBMode.hwcdc=Hardware CDC and JTAG +waveshare_esp32_s3_zero.menu.USBMode.hwcdc.build.usb_mode=1 +waveshare_esp32_s3_zero.menu.USBMode.default=USB-OTG (TinyUSB) +waveshare_esp32_s3_zero.menu.USBMode.default.build.usb_mode=0 + +waveshare_esp32_s3_zero.menu.CDCOnBoot.default=Disabled +waveshare_esp32_s3_zero.menu.CDCOnBoot.default.build.cdc_on_boot=0 +waveshare_esp32_s3_zero.menu.CDCOnBoot.cdc=Enabled +waveshare_esp32_s3_zero.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 + +waveshare_esp32_s3_zero.menu.MSCOnBoot.default=Disabled +waveshare_esp32_s3_zero.menu.MSCOnBoot.default.build.msc_on_boot=0 +waveshare_esp32_s3_zero.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode) +waveshare_esp32_s3_zero.menu.MSCOnBoot.msc.build.msc_on_boot=1 + +waveshare_esp32_s3_zero.menu.DFUOnBoot.default=Disabled +waveshare_esp32_s3_zero.menu.DFUOnBoot.default.build.dfu_on_boot=0 +waveshare_esp32_s3_zero.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode) +waveshare_esp32_s3_zero.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 + +waveshare_esp32_s3_zero.menu.UploadMode.default=UART0 / Hardware CDC +waveshare_esp32_s3_zero.menu.UploadMode.default.upload.use_1200bps_touch=false +waveshare_esp32_s3_zero.menu.UploadMode.default.upload.wait_for_upload_port=false +waveshare_esp32_s3_zero.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB) +waveshare_esp32_s3_zero.menu.UploadMode.cdc.upload.use_1200bps_touch=true +waveshare_esp32_s3_zero.menu.UploadMode.cdc.upload.wait_for_upload_port=true + +waveshare_esp32_s3_zero.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.default.build.partitions=default +waveshare_esp32_s3_zero.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +waveshare_esp32_s3_zero.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.no_ota.build.partitions=no_ota +waveshare_esp32_s3_zero.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +waveshare_esp32_s3_zero.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +waveshare_esp32_s3_zero.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.huge_app.build.partitions=huge_app +waveshare_esp32_s3_zero.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 +waveshare_esp32_s3_zero.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) +waveshare_esp32_s3_zero.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +waveshare_esp32_s3_zero.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker=RainMaker 4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker.build.partitions=rainmaker +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080 +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB=RainMaker 4MB No OTA +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.build.partitions=rainmaker_4MB_no_ota +waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656 + +waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA) +waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4128768 + +waveshare_esp32_s3_zero.menu.PartitionScheme.custom=Custom +waveshare_esp32_s3_zero.menu.PartitionScheme.custom.build.partitions= +waveshare_esp32_s3_zero.menu.PartitionScheme.custom.upload.maximum_size=16777216 + +waveshare_esp32_s3_zero.menu.CPUFreq.240=240MHz (WiFi) +waveshare_esp32_s3_zero.menu.CPUFreq.240.build.f_cpu=240000000L +waveshare_esp32_s3_zero.menu.CPUFreq.160=160MHz (WiFi) +waveshare_esp32_s3_zero.menu.CPUFreq.160.build.f_cpu=160000000L +waveshare_esp32_s3_zero.menu.CPUFreq.80=80MHz (WiFi) +waveshare_esp32_s3_zero.menu.CPUFreq.80.build.f_cpu=80000000L +waveshare_esp32_s3_zero.menu.CPUFreq.40=40MHz +waveshare_esp32_s3_zero.menu.CPUFreq.40.build.f_cpu=40000000L +waveshare_esp32_s3_zero.menu.CPUFreq.20=20MHz +waveshare_esp32_s3_zero.menu.CPUFreq.20.build.f_cpu=20000000L +waveshare_esp32_s3_zero.menu.CPUFreq.10=10MHz +waveshare_esp32_s3_zero.menu.CPUFreq.10.build.f_cpu=10000000L + +waveshare_esp32_s3_zero.menu.UploadSpeed.921600=921600 +waveshare_esp32_s3_zero.menu.UploadSpeed.921600.upload.speed=921600 +waveshare_esp32_s3_zero.menu.UploadSpeed.115200=115200 +waveshare_esp32_s3_zero.menu.UploadSpeed.115200.upload.speed=115200 +waveshare_esp32_s3_zero.menu.UploadSpeed.256000.windows=256000 +waveshare_esp32_s3_zero.menu.UploadSpeed.256000.upload.speed=256000 +waveshare_esp32_s3_zero.menu.UploadSpeed.230400.windows.upload.speed=256000 +waveshare_esp32_s3_zero.menu.UploadSpeed.230400=230400 +waveshare_esp32_s3_zero.menu.UploadSpeed.230400.upload.speed=230400 +waveshare_esp32_s3_zero.menu.UploadSpeed.460800.linux=460800 +waveshare_esp32_s3_zero.menu.UploadSpeed.460800.macosx=460800 +waveshare_esp32_s3_zero.menu.UploadSpeed.460800.upload.speed=460800 +waveshare_esp32_s3_zero.menu.UploadSpeed.512000.windows=512000 +waveshare_esp32_s3_zero.menu.UploadSpeed.512000.upload.speed=512000 + +waveshare_esp32_s3_zero.menu.DebugLevel.none=None +waveshare_esp32_s3_zero.menu.DebugLevel.none.build.code_debug=0 +waveshare_esp32_s3_zero.menu.DebugLevel.error=Error +waveshare_esp32_s3_zero.menu.DebugLevel.error.build.code_debug=1 +waveshare_esp32_s3_zero.menu.DebugLevel.warn=Warn +waveshare_esp32_s3_zero.menu.DebugLevel.warn.build.code_debug=2 +waveshare_esp32_s3_zero.menu.DebugLevel.info=Info +waveshare_esp32_s3_zero.menu.DebugLevel.info.build.code_debug=3 +waveshare_esp32_s3_zero.menu.DebugLevel.debug=Debug +waveshare_esp32_s3_zero.menu.DebugLevel.debug.build.code_debug=4 +waveshare_esp32_s3_zero.menu.DebugLevel.verbose=Verbose +waveshare_esp32_s3_zero.menu.DebugLevel.verbose.build.code_debug=5 + +waveshare_esp32_s3_zero.menu.EraseFlash.none=Disabled +waveshare_esp32_s3_zero.menu.EraseFlash.none.upload.erase_cmd= +waveshare_esp32_s3_zero.menu.EraseFlash.all=Enabled +waveshare_esp32_s3_zero.menu.EraseFlash.all.upload.erase_cmd=-e + ###################################################### ws_esp32_s3_matrix.name=Waveshare ESP32-S3-Matrix diff --git a/variants/waveshare_esp32_s3_zero/pins_arduino.h b/variants/waveshare_esp32_s3_zero/pins_arduino.h new file mode 100644 index 00000000000..01c9a5b42f1 --- /dev/null +++ b/variants/waveshare_esp32_s3_zero/pins_arduino.h @@ -0,0 +1,71 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define USB_VID 0x303a +#define USB_PID 0x822B +#define USB_MANUFACTURER "Waveshare" +#define USB_PRODUCT "ESP32-S3-Zero" +#define USB_SERIAL "" // Empty string for MAC address + +// Partial voltage measurement method +#define WS_RGB 21 + +// Mapping based on the ESP32S3 data sheet - alternate for OUTPUT +static const uint8_t OUTPUT_IO1 = 1; +static const uint8_t OUTPUT_IO2 = 2; +static const uint8_t OUTPUT_IO3 = 3; +static const uint8_t OUTPUT_IO4 = 4; +static const uint8_t OUTPUT_IO5 = 5; +static const uint8_t OUTPUT_IO6 = 6; +static const uint8_t OUTPUT_IO7 = 7; +static const uint8_t OUTPUT_IO8 = 8; +static const uint8_t OUTPUT_IO9 = 9; +static const uint8_t OUTPUT_IO10 = 10; +static const uint8_t OUTPUT_IO11 = 11; +static const uint8_t OUTPUT_IO12 = 12; +static const uint8_t OUTPUT_IO13 = 13; + +// UART0 pins +static const uint8_t TX = 43; +static const uint8_t RX = 44; + +// Analog capable pins on the header +static const uint8_t A0 = 1; +static const uint8_t A1 = 2; +static const uint8_t A2 = 3; +static const uint8_t A3 = 4; +static const uint8_t A4 = 5; +static const uint8_t A5 = 6; +static const uint8_t A6 = 7; + +// GPIO capable pins on the header +static const uint8_t D0 = 7; +static const uint8_t D1 = 6; +static const uint8_t D2 = 5; +static const uint8_t D3 = 4; +static const uint8_t D4 = 3; +static const uint8_t D5 = 2; +static const uint8_t D6 = 1; +static const uint8_t D7 = 44; +static const uint8_t D8 = 43; +static const uint8_t D9 = 40; +static const uint8_t D10 = 39; +static const uint8_t D11 = 38; +static const uint8_t D12 = 37; +static const uint8_t D13 = 36; +static const uint8_t D14 = 35; +static const uint8_t D15 = 34; +static const uint8_t D16 = 33; + +// Touch input capable pins on the header +static const uint8_t T1 = 1; +static const uint8_t T2 = 2; +static const uint8_t T3 = 3; +static const uint8_t T4 = 4; +static const uint8_t T5 = 5; +static const uint8_t T6 = 6; +static const uint8_t T7 = 7; + +#endif /* Pins_Arduino_h */ From 3f44adda34bf211ccc0b64ecf9e8c7160774cf3b Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 14:42:53 +0800 Subject: [PATCH 2/9] Added variant for ESP32-S3-Zero --- variants/waveshare_esp32_s3_zero/partitions_4MB.csv | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 variants/waveshare_esp32_s3_zero/partitions_4MB.csv diff --git a/variants/waveshare_esp32_s3_zero/partitions_4MB.csv b/variants/waveshare_esp32_s3_zero/partitions_4MB.csv new file mode 100644 index 00000000000..98cbbae586d --- /dev/null +++ b/variants/waveshare_esp32_s3_zero/partitions_4MB.csv @@ -0,0 +1,5 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +ota_0, app, ota_0, 0x10000, 0x1F0000, +ota_1, app, ota_1, 0x200000, 0x1F0000, From cb3dba6f5af36fd19c97e989ca1808596cb202a3 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 15:06:33 +0800 Subject: [PATCH 3/9] Fixed CI failures due to I2C and SPI pin definitions --- variants/waveshare_esp32_s3_zero/pins_arduino.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/variants/waveshare_esp32_s3_zero/pins_arduino.h b/variants/waveshare_esp32_s3_zero/pins_arduino.h index 01c9a5b42f1..0d73bee16d0 100644 --- a/variants/waveshare_esp32_s3_zero/pins_arduino.h +++ b/variants/waveshare_esp32_s3_zero/pins_arduino.h @@ -27,6 +27,16 @@ static const uint8_t OUTPUT_IO11 = 11; static const uint8_t OUTPUT_IO12 = 12; static const uint8_t OUTPUT_IO13 = 13; +// Def for I2C that shares the IMU I2C pins +static const uint8_t SDA = -1; +static const uint8_t SCL = -1; + +// Mapping based on the ESP32S3 data sheet - alternate for SPI2 +static const uint8_t SS = 34; // FSPICS0 +static const uint8_t MOSI = 35; // FSPID +static const uint8_t MISO = 37; // FSPIQ +static const uint8_t SCK = 36; // FSPICLK + // UART0 pins static const uint8_t TX = 43; static const uint8_t RX = 44; From 932c0e76f703cee1a72c5895c09d4ee9984d9668 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 15:23:36 +0800 Subject: [PATCH 4/9] Fixed custom partitions --- boards.txt | 2 +- variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv diff --git a/boards.txt b/boards.txt index 147ea85bd7f..e0a87f6037c 100644 --- a/boards.txt +++ b/boards.txt @@ -38739,7 +38739,7 @@ waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 waveshare_esp32_s3_zero.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) -waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=partitions_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4128768 waveshare_esp32_s3_zero.menu.PartitionScheme.custom=Custom diff --git a/variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv b/variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv new file mode 100644 index 00000000000..04240badb49 --- /dev/null +++ b/variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags + nvs, data, nvs, 0x9000, 0x5000, + otadata, data, ota, 0xE000, 0x2000, + app0, app, ota_0, 0x10000, 0x1F0000, + app1, app, ota_1, 0x200000, 0x1F0000, +coredump, data, coredump, 0x3F0000, 0x10000, From c1b5f32125a528663607adb8a86af5ad43af8d38 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 15:44:15 +0800 Subject: [PATCH 5/9] Fix the partition without ota --- variants/waveshare_esp32_s3_zero/partitions_4MB.csv | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/variants/waveshare_esp32_s3_zero/partitions_4MB.csv b/variants/waveshare_esp32_s3_zero/partitions_4MB.csv index 98cbbae586d..25eeb8c7d47 100644 --- a/variants/waveshare_esp32_s3_zero/partitions_4MB.csv +++ b/variants/waveshare_esp32_s3_zero/partitions_4MB.csv @@ -1,5 +1,3 @@ -# Name, Type, SubType, Offset, Size, Flags -nvs, data, nvs, 0x9000, 0x5000, -otadata, data, ota, 0xe000, 0x2000, -ota_0, app, ota_0, 0x10000, 0x1F0000, -ota_1, app, ota_1, 0x200000, 0x1F0000, +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +factory, app, factory, 0x10000, 0x3F0000, From ce56dbca07607bd4ce05bc4eef51b67a21d829f0 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 16:10:43 +0800 Subject: [PATCH 6/9] Fix waveshare esp32-s3-zero partition table, add 4MB partition content --- boards.txt | 4 ++-- .../partitions_4MB.csv => tools/partitions/max_app_4MB.csv | 0 .../partitions/ota_nofs_4MB.csv | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename variants/waveshare_esp32_s3_zero/partitions_4MB.csv => tools/partitions/max_app_4MB.csv (100%) rename variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv => tools/partitions/ota_nofs_4MB.csv (100%) diff --git a/boards.txt b/boards.txt index e0a87f6037c..db37279b903 100644 --- a/boards.txt +++ b/boards.txt @@ -38736,10 +38736,10 @@ waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.build.partitions=rain waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656 waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA) -waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=ota_nofs_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 waveshare_esp32_s3_zero.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) -waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=partitions_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=max_app_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4128768 waveshare_esp32_s3_zero.menu.PartitionScheme.custom=Custom diff --git a/variants/waveshare_esp32_s3_zero/partitions_4MB.csv b/tools/partitions/max_app_4MB.csv similarity index 100% rename from variants/waveshare_esp32_s3_zero/partitions_4MB.csv rename to tools/partitions/max_app_4MB.csv diff --git a/variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv b/tools/partitions/ota_nofs_4MB.csv similarity index 100% rename from variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv rename to tools/partitions/ota_nofs_4MB.csv From d7e2e061fd0e9c91f94c00295058045a42a0ba8d Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 16:10:43 +0800 Subject: [PATCH 7/9] Fix waveshare esp32-s3-zero partition table, add 4MB partition content --- boards.txt | 4 ++-- .../partitions_4MB.csv => tools/partitions/max_app_4MB.csv | 0 .../partitions/ota_nofs_4MB.csv | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename variants/waveshare_esp32_s3_zero/partitions_4MB.csv => tools/partitions/max_app_4MB.csv (100%) rename variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv => tools/partitions/ota_nofs_4MB.csv (100%) diff --git a/boards.txt b/boards.txt index e0a87f6037c..db37279b903 100644 --- a/boards.txt +++ b/boards.txt @@ -38736,10 +38736,10 @@ waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.build.partitions=rain waveshare_esp32_s3_zero.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656 waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA) -waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=ota_nofs_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 waveshare_esp32_s3_zero.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) -waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=partitions_4MB +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=max_app_4MB waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4128768 waveshare_esp32_s3_zero.menu.PartitionScheme.custom=Custom diff --git a/variants/waveshare_esp32_s3_zero/partitions_4MB.csv b/tools/partitions/max_app_4MB.csv similarity index 100% rename from variants/waveshare_esp32_s3_zero/partitions_4MB.csv rename to tools/partitions/max_app_4MB.csv diff --git a/variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv b/tools/partitions/ota_nofs_4MB.csv similarity index 100% rename from variants/waveshare_esp32_s3_zero/partitions_otanofs_4MB.csv rename to tools/partitions/ota_nofs_4MB.csv From f0d9fad03c2bbb1cac0a174c28e6dd2669c5b52d Mon Sep 17 00:00:00 2001 From: Y_hsiao_ch'un <66012385+Y1hsiaochunnn@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:19:18 +0800 Subject: [PATCH 8/9] Update tools/partitions/max_app_4MB.csv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> --- tools/partitions/max_app_4MB.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/partitions/max_app_4MB.csv b/tools/partitions/max_app_4MB.csv index 4ed17b6546d..ec30c10065b 100644 --- a/tools/partitions/max_app_4MB.csv +++ b/tools/partitions/max_app_4MB.csv @@ -1,5 +1,5 @@ # Name, Type, SubType, Offset, Size, Flags nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, -app0, app, factory, 0x10000, 0x360000, -coredump, data, coredump,0x7F0000,0x10000, +app0, app, factory, 0x10000, 0x3E0000, +coredump, data, coredump,0x3F0000,0x10000, From 6b5e5bf83fadb9b4501ac320df1f9c64f8e8867b Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 26 Aug 2024 17:24:35 +0800 Subject: [PATCH 9/9] change boards.txt --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index db37279b903..1d99766be97 100644 --- a/boards.txt +++ b/boards.txt @@ -38740,7 +38740,7 @@ waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.build.custom_partitions=ota waveshare_esp32_s3_zero.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 waveshare_esp32_s3_zero.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.build.custom_partitions=max_app_4MB -waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4128768 +waveshare_esp32_s3_zero.menu.PartitionScheme.all_app.upload.maximum_size=4063232 waveshare_esp32_s3_zero.menu.PartitionScheme.custom=Custom waveshare_esp32_s3_zero.menu.PartitionScheme.custom.build.partitions=