Skip to content

Commit 1ecfd15

Browse files
i3wateri3water
committed
update wifiduinov2&wifiduino32s3 boards setting
1 parent f3ae2a6 commit 1ecfd15

File tree

2 files changed

+63
-48
lines changed

2 files changed

+63
-48
lines changed

‎boards.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31520,16 +31520,19 @@ wifiduino32c3.build.cdc_on_boot=0
3152031520
wifiduino32c3.build.f_cpu=160000000L
3152131521
wifiduino32c3.build.flash_size=4MB
3152231522
wifiduino32c3.build.flash_freq=80m
31523-
wifiduino32c3.build.flash_mode=qio
31523+
wifiduino32c3.build.flash_mode=dio
3152431524
wifiduino32c3.build.boot=qio
31525-
wifiduino32c3.build.partitions=default
31525+
wifiduino32c3.build.partitions=no_ota
3152631526
wifiduino32c3.build.defines=
3152731527

31528-
wifiduino32c3.menu.CDCOnBoot.default=Disabled
31529-
wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
31530-
wifiduino32c3.menu.CDCOnBoot.cdc=Enabled
31531-
wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
31528+
wifiduino32c3.menu.CDCOnBoot.default=Enabled
31529+
wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=1
31530+
wifiduino32c3.menu.CDCOnBoot.cdc=Disabled
31531+
wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
3153231532

31533+
wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
31534+
wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
31535+
wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3153331536
wifiduino32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
3153431537
wifiduino32c3.menu.PartitionScheme.default.build.partitions=default
3153531538
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
3153931542
wifiduino32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
3154031543
wifiduino32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
3154131544
wifiduino32c3.menu.PartitionScheme.minimal.build.partitions=minimal
31542-
wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
31543-
wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
31544-
wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3154531545
wifiduino32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
3154631546
wifiduino32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
3154731547
wifiduino32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
@@ -31584,12 +31584,12 @@ wifiduino32c3.menu.CPUFreq.20.build.f_cpu=20000000L
3158431584
wifiduino32c3.menu.CPUFreq.10=10MHz
3158531585
wifiduino32c3.menu.CPUFreq.10.build.f_cpu=10000000L
3158631586

31587-
wifiduino32c3.menu.FlashMode.qio=QIO
31588-
wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
31589-
wifiduino32c3.menu.FlashMode.qio.build.boot=qio
3159031587
wifiduino32c3.menu.FlashMode.dio=DIO
3159131588
wifiduino32c3.menu.FlashMode.dio.build.flash_mode=dio
3159231589
wifiduino32c3.menu.FlashMode.dio.build.boot=dio
31590+
wifiduino32c3.menu.FlashMode.qio=QIO
31591+
wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
31592+
wifiduino32c3.menu.FlashMode.qio.build.boot=qio
3159331593

3159431594
wifiduino32c3.menu.FlashFreq.80=80MHz
3159531595
wifiduino32c3.menu.FlashFreq.80.build.flash_freq=80m
@@ -31633,10 +31633,10 @@ wifiduino32c3.menu.DebugLevel.debug.build.code_debug=4
3163331633
wifiduino32c3.menu.DebugLevel.verbose=Verbose
3163431634
wifiduino32c3.menu.DebugLevel.verbose.build.code_debug=5
3163531635

31636-
wifiduino32c3.menu.EraseFlash.none=Disabled
31637-
wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd=
3163831636
wifiduino32c3.menu.EraseFlash.all=Enabled
3163931637
wifiduino32c3.menu.EraseFlash.all.upload.erase_cmd=-e
31638+
wifiduino32c3.menu.EraseFlash.none=Disabled
31639+
wifiduino32c3.menu.EraseFlash.none.upload.erase_cmd=
3164031640

3164131641
##############################################################
3164231642

@@ -31672,27 +31672,27 @@ wifiduino32s3.build.cdc_on_boot=0
3167231672
wifiduino32s3.build.msc_on_boot=0
3167331673
wifiduino32s3.build.dfu_on_boot=0
3167431674
wifiduino32s3.build.f_cpu=240000000L
31675-
wifiduino32s3.build.flash_size=4MB
31675+
wifiduino32s3.build.flash_size=16MB
3167631676
wifiduino32s3.build.flash_freq=80m
3167731677
wifiduino32s3.build.flash_mode=dio
3167831678
wifiduino32s3.build.boot=qio
3167931679
wifiduino32s3.build.boot_freq=80m
31680-
wifiduino32s3.build.partitions=default
31680+
wifiduino32s3.build.partitions=app3M_fat9M_16MB
3168131681
wifiduino32s3.build.defines=
3168231682
wifiduino32s3.build.loop_core=
3168331683
wifiduino32s3.build.event_core=
31684-
wifiduino32s3.build.psram_type=qspi
31684+
wifiduino32s3.build.psram_type=opi
3168531685
wifiduino32s3.build.memory_type={build.boot}_{build.psram_type}
3168631686

31687+
wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
31688+
wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
31689+
wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
3168731690
wifiduino32s3.menu.PSRAM.disabled=Disabled
3168831691
wifiduino32s3.menu.PSRAM.disabled.build.defines=
3168931692
wifiduino32s3.menu.PSRAM.disabled.build.psram_type=qspi
3169031693
wifiduino32s3.menu.PSRAM.enabled=QSPI PSRAM
3169131694
wifiduino32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
3169231695
wifiduino32s3.menu.PSRAM.enabled.build.psram_type=qspi
31693-
wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
31694-
wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
31695-
wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
3169631696

3169731697
wifiduino32s3.menu.FlashMode.qio=QIO 80MHz
3169831698
wifiduino32s3.menu.FlashMode.qio.build.flash_mode=dio
@@ -31715,12 +31715,12 @@ wifiduino32s3.menu.FlashMode.opi.build.boot=opi
3171531715
wifiduino32s3.menu.FlashMode.opi.build.boot_freq=80m
3171631716
wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m
3171731717

31718+
wifiduino32s3.menu.FlashSize.16M=16MB (128Mb)
31719+
wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB
3171831720
wifiduino32s3.menu.FlashSize.4M=4MB (32Mb)
3171931721
wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB
3172031722
wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
3172131723
wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
31722-
wifiduino32s3.menu.FlashSize.16M=16MB (128Mb)
31723-
wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB
3172431724
#wifiduino32s3.menu.FlashSize.32M=32MB (256Mb)
3172531725
#wifiduino32s3.menu.FlashSize.32M.build.flash_size=32MB
3172631726

@@ -31761,6 +31761,9 @@ wifiduino32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
3176131761
wifiduino32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
3176231762
wifiduino32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
3176331763

31764+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
31765+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
31766+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
3176431767
wifiduino32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
3176531768
wifiduino32s3.menu.PartitionScheme.default.build.partitions=default
3176631769
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
3179131794
wifiduino32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
3179231795
wifiduino32s3.menu.PartitionScheme.fatflash.build.partitions=ffat
3179331796
wifiduino32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
31794-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
31795-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
31796-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
3179731797
wifiduino32s3.menu.PartitionScheme.rainmaker=RainMaker 4MB
3179831798
wifiduino32s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
3179931799
wifiduino32s3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080

‎variants/wifiduino32s3/pins_arduino.h

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,58 @@
22
#define Pins_Arduino_h
33

44
#include <stdint.h>
5+
#include "soc/soc_caps.h"
56

67
#define USB_VID 0x303a
78
#define USB_PID 0x1001
8-
9-
// No USER LED or NeoLED
10-
11-
static const uint8_t TX = 45;
9+
#define USB_MANUFACTURER "openjumper"
10+
#define USB_PRODUCT "Wifiduino32-S3"
11+
#define USB_SERIAL "" // Empty string for MAC address
12+
13+
14+
// Some boards have too low voltage on this pin (board design bug)
15+
// Use different pin with 3V and connect with 48
16+
// and change this setup for the chosen pin (for example 38)
17+
#define PIN_RGB_LED 48
18+
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
19+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
20+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
21+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
22+
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
23+
#define RGB_BUILTIN LED_BUILTIN
24+
#define RGB_BRIGHTNESS 64
25+
26+
static const uint8_t TX = 43;
1227
static const uint8_t RX = 44;
1328

1429
static const uint8_t SDA = 4;
1530
static const uint8_t SCL = 5;
1631

17-
static const uint8_t SS = 46;
18-
static const uint8_t MOSI = 3;
19-
static const uint8_t MISO = 20;
20-
static const uint8_t SCK = 19;
32+
static const uint8_t SS = 41;
33+
static const uint8_t MOSI = 40;
34+
static const uint8_t MISO = 38;
35+
static const uint8_t SCK = 39;
2136

22-
static const uint8_t A0 = 7;
23-
static const uint8_t A1 = 6;
37+
static const uint8_t A0 = 0;
38+
static const uint8_t A1 = 1;
2439
static const uint8_t A2 = 2;
25-
static const uint8_t A3 = 1;
40+
static const uint8_t A3 = 3;
2641
static const uint8_t A4 = 4;
2742
static const uint8_t A5 = 5;
2843

2944
static const uint8_t D0 = 44;
30-
static const uint8_t D1 = 45;
31-
static const uint8_t D2 = 42;
32-
static const uint8_t D3 = 41;
33-
static const uint8_t D4 = 0;
34-
static const uint8_t D5 = 45;
35-
static const uint8_t D6 = 48;
36-
static const uint8_t D7 = 47;
45+
static const uint8_t D1 = 43;
46+
static const uint8_t D2 = 45;
47+
static const uint8_t D3 = 46;
48+
static const uint8_t D4 = 47;
49+
static const uint8_t D5 = 48;
50+
static const uint8_t D6 = 18;
51+
static const uint8_t D7 = 17;
3752
static const uint8_t D8 = 21;
38-
static const uint8_t D9 = 14;
39-
static const uint8_t D10 = 46;
40-
static const uint8_t D11 = 3;
41-
static const uint8_t D12 = 20;
42-
static const uint8_t D13 = 19;
53+
static const uint8_t D9 = 42;
54+
static const uint8_t D10 = 41;
55+
static const uint8_t D11 = 40;
56+
static const uint8_t D12 = 38;
57+
static const uint8_t D13 = 39;
4358

4459
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)