bugfix for reboot loop affecting V3 "legacy" builds

* ``-DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE`` caused a crash when mounting the filesystem
* added "extends = " to MM legacy buildenvs
* make sure that flash_mode is always well-defined
This commit is contained in:
Frank
2025-11-29 23:16:43 +01:00
parent aa8148e02a
commit 9a4e7a6049

View File

@@ -333,6 +333,7 @@ platform = espressif32@3.5.0
platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4 platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
-Wshadow=compatible-local ;; not supported by older compilers -Wshadow=compatible-local ;; not supported by older compilers
;; -D CORE_DEBUG_LEVEL=0 -DNDEBUG ;; enable core debugging
build_flags = -g build_flags = -g
-Wno-unused-variable -Wno-unused-function ;; removes noise -Wno-unused-variable -Wno-unused-function ;; removes noise
-DARDUINO_ARCH_ESP32 -DARDUINO_ARCH_ESP32
@@ -340,7 +341,8 @@ build_flags = -g
-D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472 ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472 ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
-D CONFIG_ASYNC_TCP_STACK_SIZE=9472 -D CONFIG_ASYNC_TCP_STACK_SIZE=9472
-D LOROL_LITTLEFS ;; use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x -D LOROL_LITTLEFS ;; use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
-DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE ;; -D CORE_DEBUG_LEVEL=5 ;; enable core debug messages
;; -DDEBUG -DWLED_DEBUG ;; enable WLED debug messages
lib_deps = lib_deps =
esp32async/AsyncTCP @ 3.4.7 esp32async/AsyncTCP @ 3.4.7
; https://github.com/lorol/LITTLEFS.git ; https://github.com/lorol/LITTLEFS.git
@@ -348,11 +350,12 @@ lib_deps =
makuna/NeoPixelBus @ 2.7.5 makuna/NeoPixelBus @ 2.7.5
;; makuna/NeoPixelBus @ 2.7.9 ;; experimental ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
${env.lib_deps} ${env.lib_deps}
monitor_filters = esp32_exception_decoder
board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs
default_partitions = ${esp32.default_partitions} ;; backwards compatibility default_partitions = ${esp32.default_partitions} ;; backwards compatibility
board_build.f_flash = 80000000L board_build.f_flash = 80000000L
board_build.flash_mode = dout ;; avoid dio/quot/qio - these are broken in arduino-esp32 1.0.6.x board_build.flash_mode = dout ;; avoid dio/quot/qio - these are broken in arduino-esp32 1.0.6.x
;;board_build.flash_mode = dio
;; standard platform for esp32 ;; standard platform for esp32
[esp32] [esp32]
@@ -376,6 +379,8 @@ monitor_filters = esp32_exception_decoder
AR_build_flags = ${common_mm.AR_build_flags} AR_build_flags = ${common_mm.AR_build_flags}
AR_lib_deps = ${common_mm.AR_lib_deps} ;; optimized version, 10% faster on -S2/-C3 AR_lib_deps = ${common_mm.AR_lib_deps} ;; optimized version, 10% faster on -S2/-C3
board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs
board_build.f_flash = 80000000L
board_build.flash_mode = dio
;; WLEDMM begin ;; WLEDMM begin
@@ -449,6 +454,9 @@ lib_deps =
;; makuna/NeoPixelBus @ 2.7.9 ;; experimental ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
${env.lib_deps} ${env.lib_deps}
board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs board_build.partitions = ${esp32.default_partitions} ;; default partioning for 4MB Flash - can be overridden in build envs
monitor_filters = esp32_exception_decoder
board_build.f_flash = 80000000L
board_build.flash_mode = dio
[esp32s2] [esp32s2]
;; generic definitions for all ESP32-S2 boards ;; generic definitions for all ESP32-S2 boards
@@ -637,6 +645,7 @@ extends = env:esp32_4MB_PSRAM_S
;; legacy build for OTA compatibility with upstream 0.15.x, slow but safe ;; legacy build for OTA compatibility with upstream 0.15.x, slow but safe
[env:esp32dev_compat] [env:esp32dev_compat]
extends = esp32_legacy
board = esp32dev board = esp32dev
platform = ${esp32_legacy.platform} platform = ${esp32_legacy.platform}
platform_packages = ${esp32_legacy.platform_packages} platform_packages = ${esp32_legacy.platform_packages}
@@ -652,6 +661,7 @@ monitor_filters = esp32_exception_decoder
;; legacy build for OTA compatibility with upstream 0.15.x, faster due to qio mode ;; legacy build for OTA compatibility with upstream 0.15.x, faster due to qio mode
[env:esp32dev_qio80_compat] [env:esp32dev_qio80_compat]
extends = esp32_legacy
board = esp32dev board = esp32dev
platform = ${esp32_legacy.platform} platform = ${esp32_legacy.platform}
platform_packages = ${esp32_legacy.platform_packages} platform_packages = ${esp32_legacy.platform_packages}
@@ -686,6 +696,7 @@ extends = env:esp32_4MB_M_eth
;; legacy build for OTA compatibility with upstream 0.15.x ;; legacy build for OTA compatibility with upstream 0.15.x
;; --> use [env:esp32_4MB_M_eth] (4MB) or [env:esp32_16MB_M_eth] ;; --> use [env:esp32_4MB_M_eth] (4MB) or [env:esp32_16MB_M_eth]
[env:esp32_eth_compat] [env:esp32_eth_compat]
extends = esp32_legacy
board = esp32-poe board = esp32-poe
platform = ${esp32_legacy.platform} platform = ${esp32_legacy.platform}
platform_packages = ${esp32_legacy.platform_packages} platform_packages = ${esp32_legacy.platform_packages}
@@ -1227,6 +1238,7 @@ lib_deps_XL =
; common defaults for all MM environments ; common defaults for all MM environments
[esp32_4MB_S_base] [esp32_4MB_S_base]
extends = esp32_legacy
board = esp32dev board = esp32dev
;; legacy V3 platform ;; legacy V3 platform
platform = ${esp32_legacy.platform} platform = ${esp32_legacy.platform}