Skip to content

Commit 7285efe

Browse files
authored
Merge pull request wled#4836 from netmindz/V4-cleanup
Remove old V3 IDF
2 parents af2d46c + c33e303 commit 7285efe

File tree

1 file changed

+9
-45
lines changed

1 file changed

+9
-45
lines changed

platformio.ini

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# ------------------------------------------------------------------------------
1111

1212
# CI/release binaries
13-
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, nodemcuv2_160, esp8266_2m_160, esp01_1m_full_160, nodemcuv2_compat, esp8266_2m_compat, esp01_1m_full_compat, esp32dev, esp32dev_V4, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_16MB_opi, esp32s3dev_8MB_opi, esp32s3_4M_qspi, esp32_wrover, usermods
13+
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, nodemcuv2_160, esp8266_2m_160, esp01_1m_full_160, nodemcuv2_compat, esp8266_2m_compat, esp01_1m_full_compat, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_16MB_opi, esp32s3dev_8MB_opi, esp32s3_4M_qspi, esp32_wrover, usermods
1414

1515
src_dir = ./wled00
1616
data_dir = ./wled00/data
@@ -243,37 +243,27 @@ build_flags =
243243
-D WLED_ENABLE_GIF
244244

245245
[esp32]
246-
#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
247-
248-
platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
246+
platform = ${esp32_idf_V4.platform}
247+
platform_packages =
249248
build_unflags = ${common.build_unflags}
250-
build_flags = -g
251-
-DARDUINO_ARCH_ESP32
252-
#-DCONFIG_LITTLEFS_FOR_IDF_3_2
253-
#use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
254-
-D LOROL_LITTLEFS
255-
; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
256-
${esp32_all_variants.build_flags}
249+
build_flags = ${esp32_idf_V4.build_flags}
250+
lib_deps = ${esp32_idf_V4.lib_deps}
257251

258252
tiny_partitions = tools/WLED_ESP32_2MB_noOTA.csv
259253
default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
260254
extended_partitions = tools/WLED_ESP32_4MB_700k_FS.csv
261255
big_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; 1.8MB firmware, 256KB filesystem, coredump support
262256
large_partitions = tools/WLED_ESP32_8MB.csv
263257
extreme_partitions = tools/WLED_ESP32_16MB_9MB_FS.csv
264-
lib_deps =
265-
https://github.com/lorol/LITTLEFS.git
266-
${esp32_all_variants.lib_deps}
267-
${env.lib_deps}
258+
268259
board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs
269260
# additional build flags for audioreactive - must be applied globally
270261
AR_build_flags = ;; -fsingle-precision-constant ;; forces ArduinoFFT to use float math (2x faster)
271262
AR_lib_deps = ;; for pre-usermod-library platformio_override compatibility
272263

273264

274265
[esp32_idf_V4]
275-
;; experimental build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
276-
;; very similar to the normal ESP32 flags, but omitting Lorol LittleFS, as littlefs is included in the new framework already.
266+
;; build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
277267
;;
278268
;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
279269
;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
@@ -290,7 +280,6 @@ lib_deps =
290280
${esp32_all_variants.lib_deps}
291281
https://github.com/someweisguy/esp_dmx.git#47db25d
292282
${env.lib_deps}
293-
board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs
294283

295284
[esp32s2]
296285
;; generic definitions for all ESP32-S2 boards
@@ -438,17 +427,6 @@ custom_usermods = audioreactive
438427

439428
[env:esp32dev]
440429
board = esp32dev
441-
platform = ${esp32.platform}
442-
platform_packages = ${esp32.platform_packages}
443-
custom_usermods = audioreactive
444-
build_unflags = ${common.build_unflags}
445-
build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"ESP32\" #-D WLED_DISABLE_BROWNOUT_DET
446-
lib_deps = ${esp32.lib_deps}
447-
monitor_filters = esp32_exception_decoder
448-
board_build.partitions = ${esp32.default_partitions}
449-
450-
[env:esp32dev_V4]
451-
board = esp32dev
452430
platform = ${esp32_idf_V4.platform}
453431
build_unflags = ${common.build_unflags}
454432
custom_usermods = audioreactive
@@ -487,34 +465,20 @@ board_upload.maximum_size = 16777216
487465
board_build.f_flash = 80000000L
488466
board_build.flash_mode = dio
489467

490-
;[env:esp32dev_audioreactive]
491-
;board = esp32dev
492-
;platform = ${esp32.platform}
493-
;platform_packages = ${esp32.platform_packages}
494-
;custom_usermods = audioreactive
495-
;build_unflags = ${common.build_unflags}
496-
;build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"ESP32_audioreactive\" #-D WLED_DISABLE_BROWNOUT_DET
497-
;lib_deps = ${esp32.lib_deps}
498-
;monitor_filters = esp32_exception_decoder
499-
;board_build.partitions = ${esp32.default_partitions}
500-
;; board_build.f_flash = 80000000L
501-
;; board_build.flash_mode = dio
502-
503468
[env:esp32_eth]
504469
board = esp32-poe
505-
platform = ${esp32.platform}
506-
platform_packages = ${esp32.platform_packages}
470+
platform = ${esp32_idf_V4.platform}
507471
upload_speed = 921600
508472
custom_usermods = audioreactive
509473
build_unflags = ${common.build_unflags}
510474
build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"ESP32_Ethernet\" -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
511475
; -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
512476
lib_deps = ${esp32.lib_deps}
513477
board_build.partitions = ${esp32.default_partitions}
478+
board_build.flash_mode = dio
514479

515480
[env:esp32_wrover]
516481
extends = esp32_idf_V4
517-
platform = ${esp32_idf_V4.platform}
518482
board = ttgo-t7-v14-mini32
519483
board_build.f_flash = 80000000L
520484
board_build.flash_mode = qio

0 commit comments

Comments
 (0)