From 2e634c20fada746b4ebd1f7e777f1962d4509cec Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:50:31 +0200
Subject: [PATCH] update

- ESPAsyncWebServer 2.0.6 (fixes crashes)
- added platformV4 and platformV4_packages
- all new MCUs use same platform
---
 platformio.ini | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b9ded1f0..957225d3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -165,7 +165,7 @@ lib_compat_mode = strict
 lib_deps =
     fastled/FastLED @ 3.5.0
     IRremoteESP8266 @ 2.8.2
-    https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.5
+    https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.6
   #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
     #TFT_eSPI
   #For use SSD1306 OLED display uncomment following
@@ -228,13 +228,21 @@ 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 platform
+platformV4 = espressif32@ ~5.1.1
+platformV4_packages = platformio/framework-arduinoespressif32@ ~3.20004.220825
+;;; tasmota platform
+;platformV4 = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip
+;platformV4_packages =
+;;; V4.4.x build flags (without LOROL_LITTLEFS)
 build_flagsV4 = -g
   -DARDUINO_ARCH_ESP32
   -DCONFIG_LITTLEFS_FOR_IDF_3_2
   -D CONFIG_ASYNC_TCP_USE_WDT=0
+;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus)
 lib_depsV4 =
   ${env.lib_deps}
-  ;makuna/NeoPixelBus @ 2.6.9
   https://github.com/Makuna/NeoPixelBus.git#master @ 2.7.0  ;; NPB 2.6.9 tends to crash whith IDF V4.4.3 -> use latest NeoPixelBus dev version instead
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
 
@@ -385,9 +393,10 @@ board_build.partitions = ${esp32.default_partitions}
 
 [env:esp32s2_saola]
 board = esp32-s2-saola-1
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-platform_packages =
-framework = arduino
+;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
+;platform_packages =
+platform = ${esp32.platformV4}
+platform_packages = ${esp32.platformV4_packages}
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
 board_build.flash_mode = qio
 upload_speed = 460800
@@ -396,9 +405,10 @@ lib_deps = ${esp32s2.lib_deps}
 
 [env:esp32c3dev]
 board = esp32-c3-devkitm-1
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-platform_packages =
-framework = arduino
+;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
+;platform_packages =
+platform = ${esp32.platformV4}
+platform_packages = ${esp32.platformV4_packages}
 build_flags =  ${common.build_flags} ${esp32c3.build_flags} 
   -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
@@ -411,7 +421,6 @@ lib_deps = ${esp32c3.lib_deps}
 board = esp32-s3-devkitc-1
 platform = espressif32@5.1.1
 platform_packages = platformio/framework-arduinoespressif32@3.20004.220825
-framework = arduino
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags =  ${common.build_flags} ${esp32s3.build_flags} -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0 -D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0
@@ -520,9 +529,8 @@ board = lolin_d32_pro
 ;board = esp32cam
 ; platform = ${esp32.platform}
 ; platform_packages = ${esp32.platform_packages}
-platform = espressif32@5.1.1
-platform_packages = platformio/framework-arduinoespressif32@3.20004.220825
-framework = arduino
+platform = ${esp32.platformV4}
+platform_packages = ${esp32.platformV4_packages}
 
 upload_speed = 460800 ; or 921600
 build_unflags = ${common.build_unflags}
@@ -549,9 +557,8 @@ board_build.flash_mode = dio
 
 [env:esp32S3mdev]
 board = esp32-s3-devkitc-1
-platform = espressif32@5.1.1
-platform_packages = platformio/framework-arduinoespressif32@3.20004.220825
-framework = arduino
+platform = ${esp32.platformV4}
+platform_packages = ${esp32.platformV4_packages}
 
 upload_speed = 460800 ; or 921600
 build_unflags = ${common.build_unflags}
@@ -566,7 +573,7 @@ build_flags =  ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME
   -D IRPIN=-1
   -D HW_PIN_SDA=40
   -D HW_PIN_SCL=41
-  -D UWLED_USE_MY_CONFIG
+  -D WLED_USE_MY_CONFIG
   -D USERMOD_CUSTOMEFFECTS
   ;; for audioreactive usermod
   -D USERMOD_AUDIOREACTIVE