Merge branch 'master' into dev

Excluded modifications to ir.cpp Changed default segment creation logic.
2021-09-12 01:00:54 +02:00
parent 9be995bb08 8d4636bbab
commit d4beb2f79b
13 changed files with 71 additions and 38 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -205,11 +205,12 @@ lib_deps =
 build_flags = -g
  -DARDUINO_ARCH_ESP32
  -DCONFIG_LITTLEFS_FOR_IDF_3_2
+  -D CONFIG_ASYNC_TCP_USE_WDT=0

 lib_deps =
  ${env.lib_deps}
  makuna/NeoPixelBus @ 2.6.7
-  AsyncTCP @ 1.0.3
+  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

 [esp32s2]
 build_flags = -g
@@ -217,11 +218,13 @@ build_flags = -g
  -DCONFIG_LITTLEFS_FOR_IDF_3_2
  -DARDUINO_ARCH_ESP32S2
  -DCONFIG_IDF_TARGET_ESP32S2
+  -D CONFIG_ASYNC_TCP_USE_WDT=0
+  -DCO

 lib_deps =
  ${env.lib_deps}
  makuna/NeoPixelBus @ 2.6.7
-  AsyncTCP @ 1.0.3
+  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

 # ------------------------------------------------------------------------------
 # WLED BUILDS