remove duplictate dependancies (AsyncTCP 1.1.1)

* moving "pbolduc/AsyncTCP.git @ 1.2.0" on top of lib_deps, to prevent that AsyncTCP 1.1.1 is pulled in (due due dependacies from Aircoookie/ESPAsyncWebServer
* remove duplicate env.lib_deps from -S2 environments
This commit is contained in:
Frank
2023-04-15 21:06:00 +02:00
parent c295c87798
commit 2585b785d9
2 changed files with 11 additions and 11 deletions

View File

@@ -240,10 +240,10 @@ build_flags =
-DMIMETYPE_MINIMAL
lib_deps =
${env.lib_deps}
#https://github.com/lorol/LITTLEFS.git
ESPAsyncTCP @ 1.2.2
ESPAsyncUDP
${env.lib_deps}
makuna/NeoPixelBus @ 2.6.9
[esp32]
@@ -264,12 +264,12 @@ default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv ;; WLED standard for 4
;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; Alternative for 4MB flash: 1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing)
lib_deps =
${env.lib_deps}
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 !!
; https://github.com/lorol/LITTLEFS.git
; WLEDMM specific: use patched version of lorol LittleFS
https://github.com/softhack007/LITTLEFS-threadsafe.git#master
${env.lib_deps}
makuna/NeoPixelBus @ 2.6.9
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
;; ** For compiling with latest Frameworks (IDF4.4.x and arduino-esp32 v2.0.x) **
;;; standard V4 platform
@@ -290,10 +290,10 @@ build_flagsV4 = -g
; -DARDUINO_USB_CDC_ON_BOOT=0 ;; mandatory for "classic ESP32" when builing with arduino-esp32 >=2.0.3
;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus)
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 !!
${env.lib_deps}
;https://github.com/Makuna/NeoPixelBus.git#master ;; NPB 2.6.9 tends to crash whith IDF V4.4.3 -> use latest NeoPixelBus dev instead
makuna/NeoPixelBus @ 2.7.1
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
[esp32s2]
build_flags = -g
@@ -308,9 +308,9 @@ build_flags = -g
;; ARDUINO_USB_CDC_ON_BOOT, ARDUINO_USB_MSC_ON_BOOT, ARDUINO_USB_DFU_ON_BOOT
lib_deps =
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 !!
${env.lib_deps}
makuna/NeoPixelBus @ 2.7.1 ;; WLEDMM - new version is more stable on -S2
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
[esp32c3]
build_flags = -g
@@ -325,11 +325,11 @@ build_flags = -g
;; ARDUINO_USB_CDC_ON_BOOT
lib_deps =
makuna/NeoPixelBus @ 2.7.3 ;; WLEDMM - new version is more stable on -C3
fastled/FastLED @ 3.5.0
IRremoteESP8266 @ ~2.8.2
https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
makuna/NeoPixelBus @ 2.7.3 ;; WLEDMM - new version is more stable on -C3
[esp32s3]
;; generic definitions for all ESP32-S3 boards
@@ -345,11 +345,11 @@ build_flags = -g
;; ARDUINO_USB_MODE, ARDUINO_USB_CDC_ON_BOOT, ARDUINO_USB_MSC_ON_BOOT, ARDUINO_USB_DFU_ON_BOOT
lib_deps =
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
${env.lib_deps}
;; currently we need the latest NeoPixelBus dev version, because it contains important bugfixes for -S3
;https://github.com/Makuna/NeoPixelBus.git#master ;; NPB 2.6.9 tends to crash whith IDF V4.4.3 -> use latest NeoPixelBus dev instead
makuna/NeoPixelBus @ 2.7.3
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
# ------------------------------------------------------------------------------
@@ -1417,7 +1417,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags}
-D SR_DMTYPE=1 -D I2S_SDPIN=9 -D I2S_WSPIN=8 -D I2S_CKPIN=17 -D MCLK_PIN=18
;-D STATUSLED=-1
-D WLED_USE_MY_CONFIG
lib_deps = ${env.lib_deps} ${esp32s2.lib_deps} ${common_mm.lib_deps_S}
lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S}
lib_ignore =
IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
OneWire ; not needed as we don't include USERMOD_DALLASTEMPERATURE
@@ -1463,7 +1463,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags}
-D AUDIOPIN=-1
-D SR_DMTYPE=1 -D I2S_SDPIN=9 -D I2S_WSPIN=8 -D I2S_CKPIN=17 -D MCLK_PIN=18
-D WLED_USE_MY_CONFIG
lib_deps = ${env.lib_deps} ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M}
lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M}
lib_ignore =
IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
OneWire ; not needed as we don't include USERMOD_DALLASTEMPERATURE

View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2304141
#define VERSION 2304150
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG