Skip to content

Commit c96b2d7

Browse files
committed
platformio.ini - re-introduce platform_packages for compatibility
MM builds are still using the standard arduino platform - we'll "flip the switch" later
1 parent 4b4421b commit c96b2d7

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

platformio.ini

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,11 @@ lib_depsV4 =
424424
;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
425425

426426
;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
427+
;; platform = espressif32@ ~6.3.2
428+
;; 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)
429+
427430
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
431+
platform_packages =
428432
build_unflags = ${common.build_unflags}
429433
build_flags = -g
430434
-Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
@@ -448,8 +452,13 @@ lib_deps =
448452
;; platform_packages =
449453
;; toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
450454
;; toolchain-xtensa-esp32s2 @ 8.4.0+2021r2-patch5
455+
;; standard platform
451456
platform = espressif32@ ~6.3.2
452457
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)
458+
;; tasmota platform (optional)
459+
;; platform = ${esp32_idf_V4.platform}
460+
;; platform_packages = ${esp32_idf_V4.platform_packages}
461+
board_build.flash_mode = dio ;; prevents build error: sdkconfig.h: No such file or directory
453462

454463
build_flags = -g
455464
-DARDUINO_ARCH_ESP32 -DESP32 ;; WLEDMM
@@ -473,6 +482,7 @@ lib_deps =
473482
[esp32c3]
474483
;; generic definitions for all ESP32-C3 boards
475484
platform = ${esp32_idf_V4.platform}
485+
platform_packages = ${esp32_idf_V4.platform_packages}
476486
build_unflags = ${common.build_unflags}
477487
build_flags = -g
478488
-DARDUINO_ARCH_ESP32 -DESP32 ;; WLEDMM
@@ -495,6 +505,7 @@ lib_deps =
495505
[esp32s3]
496506
;; generic definitions for all ESP32-S3 boards
497507
platform = ${esp32_idf_V4.platform}
508+
platform_packages = ${esp32_idf_V4.platform_packages}
498509
build_unflags = ${common.build_unflags}
499510
build_flags = -g
500511
-DESP32
@@ -701,6 +712,7 @@ board_build.flash_mode = qio
701712
;; ESP32-S3-DevKitC-1 development board, with 8MB FLASH, no PSRAM (flash_mode: qio)
702713
board = esp32-s3-devkitc-1
703714
platform = ${esp32s3.platform}
715+
platform_packages = ${esp32s3.platform_packages}
704716
upload_speed = 921600 ; or 460800
705717
build_unflags = ${common.build_unflags}
706718
build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB
@@ -721,6 +733,7 @@ monitor_filters = esp32_exception_decoder
721733
board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
722734
board_build.arduino.memory_type = qio_opi ;; use with PSRAM: 8MB or 16MB
723735
platform = ${esp32s3.platform}
736+
platform_packages = ${esp32s3.platform_packages}
724737
upload_speed = 921600
725738
build_unflags = ${common.build_unflags}
726739
build_flags = ${common.build_flags} ${esp32s3.build_flags}
@@ -813,8 +826,10 @@ lib_deps = ${esp8266.lib_deps}
813826

814827
[env:lolin_s2_mini]
815828
platform = ${esp32s2.platform}
829+
platform_packages = ${esp32s2.platform_packages}
816830
board = lolin_s2_mini
817831
board_build.partitions = ${esp32.default_partitions}
832+
board_build.flash_mode = dio ;; prevents build error: sdkconfig.h: No such file or directory
818833
build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
819834
;; board_build.flash_mode = qio
820835
;; board_build.f_flash = 80000000L
@@ -850,6 +865,7 @@ lib_deps = ${esp32s2.lib_deps}
850865
;; this board need a specific partition file. OTA not possible.
851866
extends = esp32c3
852867
platform = ${esp32c3.platform}
868+
platform_packages = ${esp32c3.platform_packages}
853869
board = esp32-c3-devkitm-1
854870
build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3
855871
-D WLED_WATCHDOG_TIMEOUT=0
@@ -1166,8 +1182,8 @@ lib_deps_XL =
11661182
[esp32_4MB_S_base]
11671183
board = esp32dev
11681184
platform = ${esp32.platform}
1169-
upload_speed = 460800 ; or 921600
11701185
platform_packages = ${esp32.platform_packages}
1186+
upload_speed = 460800 ; or 921600
11711187
build_unflags = ${common.build_unflags}
11721188
build_flags = ${common.build_flags_esp32} ${common_mm.build_flags_S} ${common_mm.build_disable_sync_interfaces}
11731189
lib_deps = ${esp32.lib_deps} ${common_mm.lib_deps_S}
@@ -2234,8 +2250,12 @@ lib_ignore =
22342250
;; to ewowi - i'll optimize this entry later, as a few things can be inherited for sure. To softhack: sure ;-)
22352251
[env:esp32s2_tinyUF2_PSRAM_S]
22362252
extends = esp32_4MB_V4_S_base
2237-
platform = ${esp32s2.platform} ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
2238-
platform_packages = ${esp32s2.platform_packages}
2253+
;;platform = ${esp32s2.platform} ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
2254+
;;platform_packages = ${esp32s2.platform_packages}
2255+
2256+
;; tasmota platform needed, as we are over flash size limits for the standard platform
2257+
platform = ${esp32_idf_V4.platform}
2258+
platform_packages = ${esp32_idf_V4.platform_packages}
22392259

22402260
board = adafruit_qtpy_esp32s2
22412261
board_build.partitions = tools/partitions-4MB_spiffs-tinyuf2.csv ;; this is needed for tinyUF2 bootloader! Filename has to end in "tinyuf2.csv"
@@ -2286,15 +2306,19 @@ lib_ignore =
22862306
IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
22872307
OneWire ; not needed as we don't include USERMOD_DALLASTEMPERATURE
22882308
monitor_filters = esp32_exception_decoder
2289-
; RAM: [== ] 21.5% (used 70448 bytes from 327680 bytes)
2290-
; Flash: [==========] 99.4% (used 1432846 bytes from 1441792 bytes)
2309+
; RAM: [== ] 17.9% (used 58548 bytes from 327680 bytes)
2310+
; Flash: [======== ] 82.0% (used 1182554 bytes from 1441792 bytes)
22912311

22922312
;; MM environment for generic ESP32-S2, with PSRAM, 4MB flash (300kB filesystem to have more program space)
22932313
;; PINs assignments optimized for use with serg74 "mini shield"
22942314
[env:esp32s2_PSRAM_M]
22952315
extends = esp32_4MB_V4_M_base
2316+
;; standard platform
22962317
platform = ${esp32s2.platform} ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
22972318
platform_packages = ${esp32s2.platform_packages}
2319+
;; tasmota platform (optional)
2320+
;; platform = ${esp32_idf_V4.platform}
2321+
;; platform_packages = ${esp32_idf_V4.platform_packages}
22982322

22992323
board = lolin_s2_mini
23002324
board_build.partitions = ${esp32.extended_partitions} ;; 1.65MB firmware, 700KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)

wled00/wled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
// version code in format yymmddb (b = daily build)
10-
#define VERSION 2501100
10+
#define VERSION 2501160
1111

1212
// WLEDMM - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
1313
#define _MoonModules_WLED_

0 commit comments

Comments
 (0)