Merge branch 'master' into dev

2021-07-04 15:29:46 +02:00
parent bbdd1915eb 5903e8256f
commit 8769234e28
15 changed files with 2417 additions and 2719 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -73,7 +73,6 @@ debug_flags = -D DEBUG=1 -D WLED_DEBUG -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT

 # ------------------------------------------------------------------------------
 # FLAGS: ldscript (available ldscripts at https://github.com/esp8266/Arduino/tree/master/tools/sdk/ld)
-#    ldscript_512k ( 512 KB) =  487 KB sketch, 4 KB eeprom,      no spiffs, 16 KB reserved
 #    ldscript_1m0m (1024 KB) =  999 KB sketch, 4 KB eeprom,      no spiffs, 16 KB reserved
 #    ldscript_2m1m (2048 KB) = 1019 KB sketch, 4 KB eeprom, 1004 KB spiffs, 16 KB reserved
 #    ldscript_4m1m (4096 KB) = 1019 KB sketch, 4 KB eeprom, 1002 KB spiffs, 16 KB reserved, 2048 KB empty/ota?
@@ -129,34 +128,6 @@ ldscript_2m512k = eagle.flash.2m512.ld
 ldscript_2m1m = eagle.flash.2m1m.ld
 ldscript_4m1m = eagle.flash.4m1m.ld

-[esp8266]
-build_flags =
-  -DESP8266
-  -DFP_IN_IROM
-  ;-Wno-deprecated-declarations
-  ;-Wno-register
-; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
-  -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-; lwIP 2 - Higher Bandwidth no Features
-;  -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; lwIP 1.4 - Higher Bandwidth (Aircoookie has)
-   -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
-; VTABLES in Flash
-  -DVTABLES_IN_FLASH
-; restrict to minimal mime-types
-  -DMIMETYPE_MINIMAL
-
-[esp32]
-build_flags = -g
-  -DARDUINO_ARCH_ESP32
-  -DCONFIG_LITTLEFS_FOR_IDF_3_2
-
-[esp32s2]
-build_flags = -g
-  -DARDUINO_ARCH_ESP32
-  -DARDUINO_ARCH_ESP32S2
-  -DCONFIG_LITTLEFS_FOR_IDF_3_2
-
 [scripts_defaults]
 extra_scripts =
  pre:pio-scripts/set_version.py
@@ -186,10 +157,6 @@ upload_speed = 115200
 lib_compat_mode = strict
 lib_deps =
    fastled/FastLED @ 3.4.0
-    NeoPixelBus @ 2.6.4
-    ESPAsyncTCP @ 1.2.0
-    ESPAsyncUDP
-    AsyncTCP @ 1.0.3
    IRremoteESP8266 @ 2.7.18
    https://github.com/lorol/LITTLEFS.git
    https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.2
@@ -206,11 +173,52 @@ lib_deps =
    ; adafruit/Adafruit CCS811 Library @ 1.0.4
    ; adafruit/Adafruit Si7021 Library @ 1.4.0

-lib_ignore =
-    AsyncTCP
-
 extra_scripts             = ${scripts_defaults.extra_scripts}

+[esp8266]
+build_flags =
+  -DESP8266
+  -DFP_IN_IROM
+  ;-Wno-deprecated-declarations
+  ;-Wno-register
+; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
+  -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
+; lwIP 2 - Higher Bandwidth no Features
+;  -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+; lwIP 1.4 - Higher Bandwidth (Aircoookie has)
+   -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+; VTABLES in Flash
+  -DVTABLES_IN_FLASH
+; restrict to minimal mime-types
+  -DMIMETYPE_MINIMAL
+
+lib_deps = 
+  ${env.lib_deps}
+  # ESPAsyncTCP @ 1.2.0
+  ESPAsyncUDP
+  makuna/NeoPixelBus @ 2.6.4 # 2.6.5 and newer do not compile on ESP core < 3.0.0
+
+[esp32]
+build_flags = -g
+  -DARDUINO_ARCH_ESP32
+  -DCONFIG_LITTLEFS_FOR_IDF_3_2
+
+lib_deps =
+  ${env.lib_deps}
+  makuna/NeoPixelBus @ 2.6.5
+  AsyncTCP @ 1.0.3
+
+[esp32s2]
+build_flags = -g
+  -DARDUINO_ARCH_ESP32
+  -DCONFIG_LITTLEFS_FOR_IDF_3_2
+  -DARDUINO_ARCH_ESP32S2
+
+lib_deps =
+  ${env.lib_deps}
+  https://github.com/Makuna/NeoPixelBus.git # until next upstream release
+  AsyncTCP @ 1.0.3
+
 # ------------------------------------------------------------------------------
 # WLED BUILDS
 # ------------------------------------------------------------------------------
@@ -222,6 +230,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
+lib_deps = ${esp8266.lib_deps}

 [env:esp01_1m_full]
 board = esp01_1m
@@ -230,6 +239,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA
+lib_deps = ${esp8266.lib_deps}

 [env:esp07]
 board = esp07
@@ -238,6 +248,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}

 [env:d1_mini]
 board = d1_mini
@@ -247,6 +258,7 @@ upload_speed = 921600
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}
 monitor_filters = esp8266_exception_decoder

 [env:heltec_wifi_kit_8]
@@ -256,6 +268,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}

 [env:h803wf]
 board = d1_mini
@@ -264,15 +277,14 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D LEDPIN=1 -D WLED_DISABLE_INFRARED
+lib_deps = ${esp8266.lib_deps}

 [env:esp32dev]
 board = esp32dev
 platform = espressif32@2.0
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32
-lib_ignore =
-  ESPAsyncTCP
-  ESPAsyncUDP
+build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BROWNOUT_DET
+lib_deps = ${esp32.lib_deps}

 [env:esp32_eth]
 board = esp32-poe
@@ -280,9 +292,7 @@ platform = espressif32@2.0
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_Ethernet -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
-lib_ignore =
-  ESPAsyncTCP
-  ESPAsyncUDP
+lib_deps = ${esp32.lib_deps}

 [env:esp8285_4CH_MagicHome]
 board = esp8285
@@ -291,6 +301,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
+lib_deps = ${esp8266.lib_deps}

 [env:esp8285_4CH_H801]
 board = esp8285
@@ -299,6 +310,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
+lib_deps = ${esp8266.lib_deps}

 [env:esp8285_5CH_H801]
 board = esp8285
@@ -307,6 +319,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
+lib_deps = ${esp8266.lib_deps}

 [env:d1_mini_5CH_Shojo_PCB]
 board = d1_mini
@@ -315,6 +328,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D WLED_USE_SHOJO_PCB
+lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
 # DEVELOPMENT BOARDS
@@ -328,6 +342,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} ${common.debug_flags}
+lib_deps = ${esp8266.lib_deps}

 [env:d1_mini_ota]
 board = d1_mini
@@ -339,6 +354,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}

 [env:anavi_miracle_controller]
 board = d1_mini
@@ -347,6 +363,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266} -D LEDPIN=12 -D IRPIN=-1 -D RLYPIN=2
+lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
 # custom board configurations
@@ -366,21 +383,16 @@ build_flags = ${common.build_flags_esp32}
 ;  -D USERMOD_DALLASTEMPERATURE_CELCIUS
 ;  -D USERMOD_FOUR_LINE_DISPLAY
 ;  -D TEMPERATURE_PIN=21
-lib_deps = ${env.lib_deps}
+lib_deps = ${esp32.lib_deps}
 ;  OneWire@~2.3.5
 ;  milesburton/DallasTemperature@^3.9.0
 ;  U8g2@~2.27.2
-lib_ignore =
-  ESPAsyncTCP
-  ESPAsyncUDP

 [env:m5atom]
 board = esp32dev
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39
-lib_ignore =
-	ESPAsyncTCP
-	ESPAsyncUDP
+lib_deps = ${esp32.lib_deps}
 platform = espressif32@3.2

 [env:sp501e]
@@ -388,6 +400,7 @@ board = esp_wroom_02
 platform = ${common.platform_wled_default}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_flags = ${common.build_flags_esp8266} -D LEDPIN=3 -D BTNPIN=1
+lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
 # travis test board configurations
@@ -417,6 +430,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}

 [env:codm-controller-0.6-rev2]
 board = esp_wroom_02
@@ -425,6 +439,7 @@ platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp8266}
+lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
 # EleksTube-IPS
@@ -433,8 +448,6 @@ build_flags = ${common.build_flags_esp8266}
 board = esp32dev
 platform = espressif32@3.2
 upload_speed = 921600
-lib_deps = ${env.lib_deps}
-  TFT_eSPI
 build_flags = ${common.build_flags_esp32} -D WLED_DISABLE_BROWNOUT_DET -D WLED_DISABLE_INFRARED
  -D USERMOD_RTC
  -D USERMOD_ELEKSTUBE_IPS
@@ -456,7 +469,5 @@ build_flags = ${common.build_flags_esp32} -D WLED_DISABLE_BROWNOUT_DET -D WLED_D
  -D SPI_FREQUENCY=40000000
  -D USER_SETUP_LOADED
 monitor_filters = esp32_exception_decoder
-lib_ignore =
-  ESPAsyncTCP
-  ESPAsyncUDP
+lib_deps = ${esp32.lib_deps} TFT_eSPI