From 1ecfd15d81fc6035389147a4faf611d6f146ec94 Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Fri, 6 Jun 2025 10:49:10 +0800 Subject: [PATCH 1/8] update wifiduinov2&wifiduino32s3 boards setting --- boards.txt | 50 +++++++++++----------- variants/wifiduino32s3/pins_arduino.h | 61 +++++++++++++++++---------- 2 files changed, 63 insertions(+), 48 deletions(-) diff --git a/boards.txt b/boards.txt index d92f057a78f..6938e761b6d 100644 --- a/boards.txt +++ b/boards.txt @@ -31520,16 +31520,19 @@ wifiduino32c3.build.cdc_on_boot=0 wifiduino32c3.build.f_cpu=160000000L wifiduino32c3.build.flash_size=4MB wifiduino32c3.build.flash_freq=80m -wifiduino32c3.build.flash_mode=qio +wifiduino32c3.build.flash_mode=dio wifiduino32c3.build.boot=qio -wifiduino32c3.build.partitions=default +wifiduino32c3.build.partitions=no_ota wifiduino32c3.build.defines= -wifiduino32c3.menu.CDCOnBoot.default=Disabled -wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0 -wifiduino32c3.menu.CDCOnBoot.cdc=Enabled -wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 +wifiduino32c3.menu.CDCOnBoot.default=Enabled +wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=1 +wifiduino32c3.menu.CDCOnBoot.cdc=Disabled +wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0 +wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota +wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 wifiduino32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) wifiduino32c3.menu.PartitionScheme.default.build.partitions=default wifiduino32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) @@ -31539,9 +31542,6 @@ wifiduino32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB wifiduino32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336 wifiduino32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS) wifiduino32c3.menu.PartitionScheme.minimal.build.partitions=minimal -wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) -wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota -wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 wifiduino32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) wifiduino32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g wifiduino32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 @@ -31584,12 +31584,12 @@ wifiduino32c3.menu.CPUFreq.20.build.f_cpu=20000000L wifiduino32c3.menu.CPUFreq.10=10MHz wifiduino32c3.menu.CPUFreq.10.build.f_cpu=10000000L -wifiduino32c3.menu.FlashMode.qio=QIO -wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio -wifiduino32c3.menu.FlashMode.qio.build.boot=qio wifiduino32c3.menu.FlashMode.dio=DIO wifiduino32c3.menu.FlashMode.dio.build.flash_mode=dio wifiduino32c3.menu.FlashMode.dio.build.boot=dio +wifiduino32c3.menu.FlashMode.qio=QIO +wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio +wifiduino32c3.menu.FlashMode.qio.build.boot=qio wifiduino32c3.menu.FlashFreq.80=80MHz wifiduino32c3.menu.FlashFreq.80.build.flash_freq=80m @@ -31633,10 +31633,10 @@ wifiduino32c3.menu.DebugLevel.debug.build.code_debug=4 wifiduino32c3.menu.DebugLevel.verbose=Verbose wifiduino32c3.menu.DebugLevel.verbose.build.code_debug=5 -wifiduino32c3.menu.EraseFlash.none=Disabled -wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd= wifiduino32c3.menu.EraseFlash.all=Enabled wifiduino32c3.menu.EraseFlash.all.upload.erase_cmd=-e +wifiduino32c3.menu.EraseFlash.none=Disabled +wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd= ############################################################## @@ -31672,27 +31672,27 @@ wifiduino32s3.build.cdc_on_boot=0 wifiduino32s3.build.msc_on_boot=0 wifiduino32s3.build.dfu_on_boot=0 wifiduino32s3.build.f_cpu=240000000L -wifiduino32s3.build.flash_size=4MB +wifiduino32s3.build.flash_size=16MB wifiduino32s3.build.flash_freq=80m wifiduino32s3.build.flash_mode=dio wifiduino32s3.build.boot=qio wifiduino32s3.build.boot_freq=80m -wifiduino32s3.build.partitions=default +wifiduino32s3.build.partitions=app3M_fat9M_16MB wifiduino32s3.build.defines= wifiduino32s3.build.loop_core= wifiduino32s3.build.event_core= -wifiduino32s3.build.psram_type=qspi +wifiduino32s3.build.psram_type=opi wifiduino32s3.build.memory_type={build.boot}_{build.psram_type} +wifiduino32s3.menu.PSRAM.opi=OPI PSRAM +wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM +wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi wifiduino32s3.menu.PSRAM.disabled=Disabled wifiduino32s3.menu.PSRAM.disabled.build.defines= wifiduino32s3.menu.PSRAM.disabled.build.psram_type=qspi wifiduino32s3.menu.PSRAM.enabled=QSPI PSRAM wifiduino32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM wifiduino32s3.menu.PSRAM.enabled.build.psram_type=qspi -wifiduino32s3.menu.PSRAM.opi=OPI PSRAM -wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM -wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi wifiduino32s3.menu.FlashMode.qio=QIO 80MHz wifiduino32s3.menu.FlashMode.qio.build.flash_mode=dio @@ -31715,12 +31715,12 @@ wifiduino32s3.menu.FlashMode.opi.build.boot=opi wifiduino32s3.menu.FlashMode.opi.build.boot_freq=80m wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m +wifiduino32s3.menu.FlashSize.16M=16MB (128Mb) +wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB wifiduino32s3.menu.FlashSize.4M=4MB (32Mb) wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB wifiduino32s3.menu.FlashSize.8M=8MB (64Mb) wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB -wifiduino32s3.menu.FlashSize.16M=16MB (128Mb) -wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB #wifiduino32s3.menu.FlashSize.32M=32MB (256Mb) #wifiduino32s3.menu.FlashSize.32M.build.flash_size=32MB @@ -31761,6 +31761,9 @@ wifiduino32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB) wifiduino32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true wifiduino32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true +wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS) +wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB +wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 wifiduino32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) wifiduino32s3.menu.PartitionScheme.default.build.partitions=default wifiduino32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) @@ -31791,9 +31794,6 @@ wifiduino32s3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 wifiduino32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS) wifiduino32s3.menu.PartitionScheme.fatflash.build.partitions=ffat wifiduino32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152 -wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS) -wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB -wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 wifiduino32s3.menu.PartitionScheme.rainmaker=RainMaker 4MB wifiduino32s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker wifiduino32s3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080 diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h index d26e415910e..1a069632551 100644 --- a/variants/wifiduino32s3/pins_arduino.h +++ b/variants/wifiduino32s3/pins_arduino.h @@ -2,43 +2,58 @@ #define Pins_Arduino_h #include +#include "soc/soc_caps.h" #define USB_VID 0x303a #define USB_PID 0x1001 - -// No USER LED or NeoLED - -static const uint8_t TX = 45; +#define USB_MANUFACTURER "openjumper" +#define USB_PRODUCT "Wifiduino32-S3" +#define USB_SERIAL "" // Empty string for MAC address + + +// Some boards have too low voltage on this pin (board design bug) +// Use different pin with 3V and connect with 48 +// and change this setup for the chosen pin (for example 38) +#define PIN_RGB_LED 48 +// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino +static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() +#define RGB_BUILTIN LED_BUILTIN +#define RGB_BRIGHTNESS 64 + +static const uint8_t TX = 43; static const uint8_t RX = 44; static const uint8_t SDA = 4; static const uint8_t SCL = 5; -static const uint8_t SS = 46; -static const uint8_t MOSI = 3; -static const uint8_t MISO = 20; -static const uint8_t SCK = 19; +static const uint8_t SS = 41; +static const uint8_t MOSI = 40; +static const uint8_t MISO = 38; +static const uint8_t SCK = 39; -static const uint8_t A0 = 7; -static const uint8_t A1 = 6; +static const uint8_t A0 = 0; +static const uint8_t A1 = 1; static const uint8_t A2 = 2; -static const uint8_t A3 = 1; +static const uint8_t A3 = 3; static const uint8_t A4 = 4; static const uint8_t A5 = 5; static const uint8_t D0 = 44; -static const uint8_t D1 = 45; -static const uint8_t D2 = 42; -static const uint8_t D3 = 41; -static const uint8_t D4 = 0; -static const uint8_t D5 = 45; -static const uint8_t D6 = 48; -static const uint8_t D7 = 47; +static const uint8_t D1 = 43; +static const uint8_t D2 = 45; +static const uint8_t D3 = 46; +static const uint8_t D4 = 47; +static const uint8_t D5 = 48; +static const uint8_t D6 = 18; +static const uint8_t D7 = 17; static const uint8_t D8 = 21; -static const uint8_t D9 = 14; -static const uint8_t D10 = 46; -static const uint8_t D11 = 3; -static const uint8_t D12 = 20; -static const uint8_t D13 = 19; +static const uint8_t D9 = 42; +static const uint8_t D10 = 41; +static const uint8_t D11 = 40; +static const uint8_t D12 = 38; +static const uint8_t D13 = 39; #endif /* Pins_Arduino_h */ From e6ca54810b0601be3f794f674fed6256f1e03e0d Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Fri, 6 Jun 2025 11:13:47 +0800 Subject: [PATCH 2/8] fix wifiduinov2&wifiduino32s3 build board error. --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 6938e761b6d..b6c004bd39f 100644 --- a/boards.txt +++ b/boards.txt @@ -31513,7 +31513,7 @@ wifiduino32c3.build.target=esp wifiduino32c3.build.mcu=esp32c3 wifiduino32c3.build.core=esp32 wifiduino32c3.build.variant=wifiduinov2 -wifiduino32c3.build.board=WiFiduinoV2 +wifiduino32c3.build.board=WIFIDUINOV2 wifiduino32c3.build.bootloader_addr=0x0 wifiduino32c3.build.cdc_on_boot=0 @@ -31665,7 +31665,7 @@ wifiduino32s3.build.target=esp32s3 wifiduino32s3.build.mcu=esp32s3 wifiduino32s3.build.core=esp32 wifiduino32s3.build.variant=wifiduino32s3 -wifiduino32s3.build.board=WiFiduino32S3 +wifiduino32s3.build.board=WIFIDUINO32S3 wifiduino32s3.build.usb_mode=1 wifiduino32s3.build.cdc_on_boot=0 From f1eaa80e0733f252c54ae71d75ed1c1e364870db Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Mon, 9 Jun 2025 11:02:59 +0800 Subject: [PATCH 3/8] fix wifiduinov2(esp32c3) board setting --- boards.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boards.txt b/boards.txt index 13bc21fbee0..95adf92a156 100644 --- a/boards.txt +++ b/boards.txt @@ -31516,12 +31516,12 @@ wifiduino32c3.build.variant=wifiduinov2 wifiduino32c3.build.board=WIFIDUINOV2 wifiduino32c3.build.bootloader_addr=0x0 -wifiduino32c3.build.cdc_on_boot=0 +wifiduino32c3.build.cdc_on_boot=1 wifiduino32c3.build.f_cpu=160000000L wifiduino32c3.build.flash_size=4MB wifiduino32c3.build.flash_freq=80m wifiduino32c3.build.flash_mode=dio -wifiduino32c3.build.boot=qio +wifiduino32c3.build.boot=dio wifiduino32c3.build.partitions=no_ota wifiduino32c3.build.defines= @@ -31633,10 +31633,10 @@ wifiduino32c3.menu.DebugLevel.debug.build.code_debug=4 wifiduino32c3.menu.DebugLevel.verbose=Verbose wifiduino32c3.menu.DebugLevel.verbose.build.code_debug=5 -wifiduino32c3.menu.EraseFlash.all=Enabled -wifiduino32c3.menu.EraseFlash.all.upload.erase_cmd=-e wifiduino32c3.menu.EraseFlash.none=Disabled wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd= +wifiduino32c3.menu.EraseFlash.all=Enabled +wifiduino32c3.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## From 9097877048393948862343554c6898b5a57a3c55 Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Mon, 9 Jun 2025 12:29:14 +0800 Subject: [PATCH 4/8] fix wifiduinov2(esp32c3) cdc on boot default setting. --- boards.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boards.txt b/boards.txt index 95adf92a156..c1705dc0190 100644 --- a/boards.txt +++ b/boards.txt @@ -31516,7 +31516,7 @@ wifiduino32c3.build.variant=wifiduinov2 wifiduino32c3.build.board=WIFIDUINOV2 wifiduino32c3.build.bootloader_addr=0x0 -wifiduino32c3.build.cdc_on_boot=1 +wifiduino32c3.build.cdc_on_boot=0 wifiduino32c3.build.f_cpu=160000000L wifiduino32c3.build.flash_size=4MB wifiduino32c3.build.flash_freq=80m @@ -31525,10 +31525,10 @@ wifiduino32c3.build.boot=dio wifiduino32c3.build.partitions=no_ota wifiduino32c3.build.defines= -wifiduino32c3.menu.CDCOnBoot.default=Enabled -wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=1 -wifiduino32c3.menu.CDCOnBoot.cdc=Disabled -wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0 +wifiduino32c3.menu.CDCOnBoot.default=Disabled +wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0 +wifiduino32c3.menu.CDCOnBoot.cdc=Enabled +wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota From a3cbf4243f780cf2d93b25afd48fc8b2bbbc616b Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Tue, 10 Jun 2025 10:59:47 +0800 Subject: [PATCH 5/8] fix wifiduino32s3 spi pin set --- variants/wifiduino32s3/pins_arduino.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h index 1a069632551..ebd866be1ad 100644 --- a/variants/wifiduino32s3/pins_arduino.h +++ b/variants/wifiduino32s3/pins_arduino.h @@ -29,11 +29,6 @@ static const uint8_t RX = 44; static const uint8_t SDA = 4; static const uint8_t SCL = 5; -static const uint8_t SS = 41; -static const uint8_t MOSI = 40; -static const uint8_t MISO = 38; -static const uint8_t SCK = 39; - static const uint8_t A0 = 0; static const uint8_t A1 = 1; static const uint8_t A2 = 2; From ac08a1090842aa327c87d6c260848a3b679aabe9 Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Tue, 10 Jun 2025 11:07:29 +0800 Subject: [PATCH 6/8] change wifiduino32s3 spi pin to spi1 --- variants/wifiduino32s3/pins_arduino.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h index ebd866be1ad..a12f7912463 100644 --- a/variants/wifiduino32s3/pins_arduino.h +++ b/variants/wifiduino32s3/pins_arduino.h @@ -29,6 +29,11 @@ static const uint8_t RX = 44; static const uint8_t SDA = 4; static const uint8_t SCL = 5; +static const uint8_t SS = 10; +static const uint8_t MOSI = 11; +static const uint8_t MISO = 13; +static const uint8_t SCK = 12; + static const uint8_t A0 = 0; static const uint8_t A1 = 1; static const uint8_t A2 = 2; From 7bd08e332a2fcc2ea64aff9e556b6c6931b868e0 Mon Sep 17 00:00:00 2001 From: i3water <121024123@qq.com> Date: Tue, 10 Jun 2025 14:00:07 +0800 Subject: [PATCH 7/8] remove 32Mb flash size --- boards.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/boards.txt b/boards.txt index c1705dc0190..8fbe8088923 100644 --- a/boards.txt +++ b/boards.txt @@ -31717,8 +31717,6 @@ wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m wifiduino32s3.menu.FlashSize.16M=16MB (128Mb) wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB -wifiduino32s3.menu.FlashSize.4M=4MB (32Mb) -wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB wifiduino32s3.menu.FlashSize.8M=8MB (64Mb) wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB #wifiduino32s3.menu.FlashSize.32M=32MB (256Mb) From c03a07bbcbda990467ffb9de48bfeea8623147dc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 06:07:29 +0000 Subject: [PATCH 8/8] ci(pre-commit): Apply automatic fixes --- variants/wifiduino32s3/pins_arduino.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h index a12f7912463..4fc08139c0e 100644 --- a/variants/wifiduino32s3/pins_arduino.h +++ b/variants/wifiduino32s3/pins_arduino.h @@ -4,13 +4,12 @@ #include #include "soc/soc_caps.h" -#define USB_VID 0x303a -#define USB_PID 0x1001 +#define USB_VID 0x303a +#define USB_PID 0x1001 #define USB_MANUFACTURER "openjumper" #define USB_PRODUCT "Wifiduino32-S3" #define USB_SERIAL "" // Empty string for MAC address - // Some boards have too low voltage on this pin (board design bug) // Use different pin with 3V and connect with 48 // and change this setup for the chosen pin (for example 38)