Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

post-merge fixes, upgrade ESPAsyncWebServer 2.2.1

Browse Source
This commit is contained in:
Frank
2024-04-23 17:32:38 +02:00
parent 7ca4fc070b
commit e743c9b96c
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
platformio.ini
View File

@@ -239,8 +239,8 @@ lib_deps =
IRremoteESP8266 @ 2.8.2
;;makuna/NeoPixelBus @ 2.7.5 ;; WLEDMM will be added in board specific sections
;;https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
https://github.com/lost-hope/ESPAsyncWebServer.git#master ;; WLEDMM to display .log and .wled files in /edit
;; https://github.com/Aircoookie/ESPAsyncWebServer.git @ ^2.2.1
;; https://github.com/lost-hope/ESPAsyncWebServer.git#master ;; WLEDMM to display .log and .wled files in /edit
https://github.com/Aircoookie/ESPAsyncWebServer.git @ 2.2.1 ;; newer with bugfixes and stability improvements
#For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
#TFT_eSPI
#For compatible OLED display uncomment following
@@ -308,7 +308,6 @@ default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv ;; WLED standard for 4
;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; WLEDMM alternative for 4MB flash: 1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing)
tiny_partitions = tools/WLED_ESP32_2MB_noOTA.csv
default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
extended_partitions = tools/WLED_ESP32_4MB_700k_FS.csv
big_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; 1.8MB firmware, 256KB filesystem, coredump support
large_partitions = tools/WLED_ESP32_8MB.csv
@@ -322,6 +321,10 @@ lib_deps =
makuna/NeoPixelBus @ 2.7.5
${env.lib_deps}
;; Compatibility with upstream --> you should prefer using ${common_mm.build_flags_S} and ${common_mm.lib_deps_S}
AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT
AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2 ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
;; WLEDMM begin
;; ** For compiling with latest Frameworks (IDF4.4.x and arduino-esp32 v2.0.x) **
@@ -350,8 +353,8 @@ build_flagsV4 = -g
lib_depsV4 =
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
makuna/NeoPixelBus @ 2.7.5
${env.lib_deps}
https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
${env.lib_deps}
;; WLEDMM end
@@ -379,8 +382,8 @@ lib_deps =
[esp32s2]
;; generic definitions for all ESP32-S2 boards
;;platform = espressif32@5.2.0
;;platform_packages =
;; platform = espressif32@5.2.0
;; platform_packages =
;; toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
;; toolchain-xtensa-esp32s2 @ 8.4.0+2021r2-patch5
platform = espressif32@ ~6.3.2
@@ -611,21 +614,22 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = ${esp32s2.lib_deps}
[env:esp32_wrover]
extends = esp32_idf_V4
platform = ${esp32_idf_V4.platform}
platform_packages = ${esp32_idf_V4.platform_packages}
board = ttgo-t7-v14-mini32
board_build.f_flash = 80000000L
board_build.flash_mode = qio
board_build.partitions = ${esp32.extended_partitions}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32_V4} -D WLED_RELEASE_NAME=ESP32_WROVER
-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue ;; Older ESP32 (rev.<3) need a PSRAM fix (increases static RAM used) https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/external-ram.html
-D LEDPIN=25
; ${esp32.AR_build_flags}
lib_deps = ${esp32_idf_V4.lib_deps}
; ${esp32.AR_lib_deps}
;; WLEDMM: use WLEDMM build environments
;; [env:esp32_wrover]
;; extends = esp32_idf_V4
;; platform = ${esp32_idf_V4.platform}
;; platform_packages = ${esp32_idf_V4.platform_packages}
;; board = ttgo-t7-v14-mini32
;; board_build.f_flash = 80000000L
;; board_build.flash_mode = qio
;; board_build.partitions = ${esp32.extended_partitions}
;; build_unflags = ${common.build_unflags}
;; build_flags = ${common.build_flags_esp32_V4} -D WLED_RELEASE_NAME=ESP32_WROVER
;; -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue ;; Older ESP32 (rev.<3) need a PSRAM fix (increases static RAM used) https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/external-ram.html
;; -D LEDPIN=25
;; ; ${esp32.AR_build_flags}
;; lib_deps = ${esp32_idf_V4.lib_deps}
;; ; ${esp32.AR_lib_deps}
[env:esp32c3dev]
extends = esp32c3
@@ -764,9 +768,8 @@ platform_packages = ${esp32s2.platform_packages}
board = lolin_s2_mini
board_build.partitions = ${esp32.default_partitions}
build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
;board_build.flash_mode = qio
;board_build.f_flash = 80000000L
build_unflags = ${common.build_unflags}
;; board_build.flash_mode = qio
;; board_build.f_flash = 80000000L
build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=ESP32-S2
-DBOARD_HAS_PSRAM
-DARDUINO_USB_CDC_ON_BOOT=1 # try disabling and enabling unflag above in case of board-specific issues, will disable Serial

2
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2404201
#define VERSION 2404230
// 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_