Skip to content

Commit 4b4421b

Browse files
netmindzWill Tatam
authored and
Will Tatam
committed
Merge pull request wled#4492 from Aircoookie/V4
V4
1 parent e761432 commit 4b4421b

File tree

2 files changed

+56
-27
lines changed

2 files changed

+56
-27
lines changed

boards/lolin_s3_mini.json

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_qspi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DBOARD_HAS_PSRAM",
10+
"-DARDUINO_LOLIN_S3_MINI",
11+
"-DARDUINO_USB_MODE=1"
12+
],
13+
"f_cpu": "240000000L",
14+
"f_flash": "80000000L",
15+
"flash_mode": "qio",
16+
"hwids": [
17+
[
18+
"0x303A",
19+
"0x8167"
20+
]
21+
],
22+
"mcu": "esp32s3",
23+
"variant": "lolin_s3_mini"
24+
},
25+
"connectivity": [
26+
"bluetooth",
27+
"wifi"
28+
],
29+
"debug": {
30+
"openocd_target": "esp32s3.cfg"
31+
},
32+
"frameworks": [
33+
"arduino",
34+
"espidf"
35+
],
36+
"name": "WEMOS LOLIN S3 Mini",
37+
"upload": {
38+
"flash_size": "4MB",
39+
"maximum_ram_size": 327680,
40+
"maximum_size": 4194304,
41+
"require_upload_port": true,
42+
"speed": 460800
43+
},
44+
"url": "https://www.wemos.cc/en/latest/s3/index.html",
45+
"vendor": "WEMOS"
46+
}
47+

platformio.ini

+9-27
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,10 @@ lib_depsV4 =
422422
;;
423423
;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
424424
;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
425-
platform = espressif32@ ~6.3.2
426-
platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0 ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
425+
426+
;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
427+
platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.06.02/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.9 with IPv6 support, based on IDF 4.4.4
428+
build_unflags = ${common.build_unflags}
427429
build_flags = -g
428430
-Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
429431
-DARDUINO_ARCH_ESP32 -DESP32
@@ -470,8 +472,8 @@ lib_deps =
470472

471473
[esp32c3]
472474
;; generic definitions for all ESP32-C3 boards
473-
platform = espressif32@ ~6.3.2
474-
platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0 ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
475+
platform = ${esp32_idf_V4.platform}
476+
build_unflags = ${common.build_unflags}
475477
build_flags = -g
476478
-DARDUINO_ARCH_ESP32 -DESP32 ;; WLEDMM
477479
-DARDUINO_ARCH_ESP32C3
@@ -492,8 +494,8 @@ lib_deps =
492494

493495
[esp32s3]
494496
;; generic definitions for all ESP32-S3 boards
495-
platform = espressif32@ ~6.3.2
496-
platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0 ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
497+
platform = ${esp32_idf_V4.platform}
498+
build_unflags = ${common.build_unflags}
497499
build_flags = -g
498500
-DESP32
499501
-DARDUINO_ARCH_ESP32
@@ -611,21 +613,6 @@ lib_deps = ${esp32.lib_deps}
611613
monitor_filters = esp32_exception_decoder
612614
board_build.partitions = ${esp32.default_partitions}
613615

614-
;WLEDMM: use WLEDMM build environments
615-
; [env:esp32dev_audioreactive]
616-
; board = esp32dev
617-
; platform = ${esp32.platform}
618-
; platform_packages = ${esp32.platform_packages}
619-
; build_unflags = ${common.build_unflags}
620-
; build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_audioreactive #-D WLED_DISABLE_BROWNOUT_DET
621-
; ${esp32.AR_build_flags}
622-
; lib_deps = ${esp32.lib_deps}
623-
; ${esp32.AR_lib_deps}
624-
; monitor_filters = esp32_exception_decoder
625-
; board_build.partitions = ${esp32.default_partitions}
626-
; ; board_build.f_flash = 80000000L
627-
; ; board_build.flash_mode = dio
628-
629616
[env:esp32dev_qio80]
630617
board = esp32dev
631618
platform = ${esp32.platform}
@@ -644,7 +631,6 @@ board_build.flash_mode = qio
644631
;; please erase your device before installing.
645632
board = esp32dev
646633
platform = ${esp32_idf_V4.platform}
647-
platform_packages = ${esp32_idf_V4.platform_packages}
648634
build_unflags = ${common.build_unflags}
649635
build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=ESP32_V4_qio80 #-D WLED_DISABLE_BROWNOUT_DET
650636
lib_deps = ${esp32_idf_V4.lib_deps}
@@ -698,7 +684,6 @@ lib_deps = ${esp32s2.lib_deps}
698684
[env:esp32c3dev]
699685
extends = esp32c3
700686
platform = ${esp32c3.platform}
701-
platform_packages = ${esp32c3.platform_packages}
702687
framework = arduino
703688
board = esp32-c3-devkitm-1
704689
board_build.partitions = ${esp32.default_partitions}
@@ -710,12 +695,12 @@ build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=
710695
upload_speed = 460800
711696
build_unflags = ${common.build_unflags}
712697
lib_deps = ${esp32c3.lib_deps}
698+
board_build.flash_mode = qio
713699

714700
[env:esp32s3dev_8MB]
715701
;; ESP32-S3-DevKitC-1 development board, with 8MB FLASH, no PSRAM (flash_mode: qio)
716702
board = esp32-s3-devkitc-1
717703
platform = ${esp32s3.platform}
718-
platform_packages = ${esp32s3.platform_packages}
719704
upload_speed = 921600 ; or 460800
720705
build_unflags = ${common.build_unflags}
721706
build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB
@@ -736,7 +721,6 @@ monitor_filters = esp32_exception_decoder
736721
board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
737722
board_build.arduino.memory_type = qio_opi ;; use with PSRAM: 8MB or 16MB
738723
platform = ${esp32s3.platform}
739-
platform_packages = ${esp32s3.platform_packages}
740724
upload_speed = 921600
741725
build_unflags = ${common.build_unflags}
742726
build_flags = ${common.build_flags} ${esp32s3.build_flags}
@@ -829,7 +813,6 @@ lib_deps = ${esp8266.lib_deps}
829813

830814
[env:lolin_s2_mini]
831815
platform = ${esp32s2.platform}
832-
platform_packages = ${esp32s2.platform_packages}
833816
board = lolin_s2_mini
834817
board_build.partitions = ${esp32.default_partitions}
835818
build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
@@ -867,7 +850,6 @@ lib_deps = ${esp32s2.lib_deps}
867850
;; this board need a specific partition file. OTA not possible.
868851
extends = esp32c3
869852
platform = ${esp32c3.platform}
870-
platform_packages = ${esp32c3.platform_packages}
871853
board = esp32-c3-devkitm-1
872854
build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3
873855
-D WLED_WATCHDOG_TIMEOUT=0

0 commit comments

Comments
 (0)