platformio.ini - re-introduce platform_packages for compatibility

MM builds are still using the standard arduino platform - we'll "flip the switch" later
2025-01-16 12:03:08 +01:00
parent 4b4421b73b
commit c96b2d7249
2 changed files with 30 additions and 6 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -424,7 +424,11 @@ lib_depsV4 =
 ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.

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

 build_flags = -g
  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
@@ -473,6 +482,7 @@ lib_deps =
 [esp32c3]
 ;; generic definitions for all ESP32-C3 boards
 platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}
 build_unflags = ${common.build_unflags}
 build_flags = -g
  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
@@ -495,6 +505,7 @@ lib_deps =
 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
 platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}
 build_unflags = ${common.build_unflags}
 build_flags = -g
  -DESP32
@@ -701,6 +712,7 @@ board_build.flash_mode = qio
 ;; ESP32-S3-DevKitC-1 development board, with 8MB FLASH, no PSRAM (flash_mode: qio)
 board = esp32-s3-devkitc-1
 platform = ${esp32s3.platform}
+platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600 ; or  460800
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB
@@ -721,6 +733,7 @@ monitor_filters = esp32_exception_decoder
 board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
 board_build.arduino.memory_type = qio_opi     ;; use with PSRAM: 8MB or 16MB
 platform = ${esp32s3.platform}
+platform_packages = ${esp32s3.platform_packages}
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32s3.build_flags}
@@ -813,8 +826,10 @@ lib_deps = ${esp8266.lib_deps}

 [env:lolin_s2_mini]
 platform = ${esp32s2.platform}
+platform_packages = ${esp32s2.platform_packages}
 board = lolin_s2_mini
 board_build.partitions = ${esp32.default_partitions}
+board_build.flash_mode = dio   ;; prevents build error:  sdkconfig.h: No such file or directory
 build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
 ;; board_build.flash_mode = qio
 ;; board_build.f_flash = 80000000L
@@ -850,6 +865,7 @@ lib_deps = ${esp32s2.lib_deps}
 ;; this board need a specific partition file. OTA not possible.
 extends = esp32c3
 platform = ${esp32c3.platform}
+platform_packages = ${esp32c3.platform_packages}
 board = esp32-c3-devkitm-1
 build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3
  -D WLED_WATCHDOG_TIMEOUT=0
@@ -1166,8 +1182,8 @@ lib_deps_XL =
 [esp32_4MB_S_base]
 board = esp32dev
 platform = ${esp32.platform}
-upload_speed = 460800 ; or 921600
 platform_packages = ${esp32.platform_packages}
+upload_speed = 460800 ; or 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} ${common_mm.build_flags_S} ${common_mm.build_disable_sync_interfaces}
 lib_deps = ${esp32.lib_deps} ${common_mm.lib_deps_S}
@@ -2234,8 +2250,12 @@ lib_ignore =
 ;; to ewowi - i'll optimize this entry later, as a few things can be inherited for sure. To softhack: sure ;-)
 [env:esp32s2_tinyUF2_PSRAM_S]
 extends = esp32_4MB_V4_S_base
-platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
-platform_packages = ${esp32s2.platform_packages}
+;;platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
+;;platform_packages = ${esp32s2.platform_packages}
+
+;; tasmota platform needed, as we are over flash size limits for the standard platform
+platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}

 board = adafruit_qtpy_esp32s2
 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 =
  IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
  OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
 monitor_filters = esp32_exception_decoder
-; RAM:   [==        ]  21.5% (used 70448 bytes from 327680 bytes)
-; Flash: [==========]  99.4% (used 1432846 bytes from 1441792 bytes)
+; RAM:   [==        ]  17.9% (used 58548 bytes from 327680 bytes)
+; Flash: [========  ]  82.0% (used 1182554 bytes from 1441792 bytes)

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

 board = lolin_s2_mini
 board_build.partitions = ${esp32.extended_partitions}   ;; 1.65MB firmware, 700KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -7,7 +7,7 @@
 */

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

 // 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.
 #define _MoonModules_WLED_