Merge pull request Aircoookie#17 from Aircoookie/master

merge upstream

.devcontainer/devcontainer.json

@@ -31,14 +31,15 @@
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-python.python"
+		"ms-python.python",
+		"platformio.platformio-ide"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pip3 install --user -r requirements.txt",
+	"postCreateCommand": "npm install",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build: HTML and binary",
+      "dependsOn": [
+        "Build: HTML only",
+        "Build: binary only"
+      ],
+      "dependsOrder": "sequence",
+      "problemMatcher": [
+        "$platformio",
+      ],
+    },
+    {
+      "type": "PlatformIO",
+      "label": "Build: binary only",
+      "task": "Build",
+      "group": {
+        "kind": "build",
+        "isDefault": true,
+      },
+      "problemMatcher": [
+        "$platformio"
+      ],
+      "presentation": {
+        "panel": "shared"
+      }
+    },
+    {
+      "type": "npm",
+      "script": "build",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "Build: HTML only",
+      "detail": "npm run build",
+      "presentation": {
+        "panel": "shared"
+      }
+    }
+  ]
+}

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ### WLED version 0.11.0
 
+#### Build 2012020
+
+-   UDP `parsePacket()` with sync disabled (#1390)
+-   Added Multi RGBW DMX mode (PR #1383)
+
+#### Build 2012010
+
+-   Fixed compilation for analog (PWM) LEDs
+
 #### Build 2011290
 
 -   Release of WLED 0.11.0 "Mirai"

platformio.ini

@@ -37,7 +37,7 @@
 src_dir  = ./wled00
 data_dir = ./wled00/data
 build_cache_dir = ~/.buildcache
-extra_configs = 
+extra_configs =
   platformio_override.ini
 
 [common]
@@ -59,14 +59,17 @@ arduino_core_git = https://github.com/platformio/platform-espressif8266#feature/
 platform_wled_default = ${common.arduino_core_2_7_4}
 # We use 2.7.4.7 for all, includes PWM flicker fix and Wstring optimization
 platform_packages = tasmota/framework-arduinoespressif8266 @ 3.20704.7
+                    platformio/toolchain-xtensa @ ~2.40802.200502
+                    platformio/tool-esptool @ ~1.413.0
+                    platformio/tool-esptoolpy @ ~1.30000.0
 
 # ------------------------------------------------------------------------------
 # FLAGS: DEBUG
 #
 # ------------------------------------------------------------------------------
 debug_flags = -D DEBUG=1 -D WLED_DEBUG -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
 #if needed (for memleaks etc) also add; -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h"
-#-DDEBUG_ESP_CORE is not working right now 
+#-DDEBUG_ESP_CORE is not working right now
 
 # ------------------------------------------------------------------------------
 # FLAGS: ldscript (available ldscripts at https://github.com/esp8266/Arduino/tree/master/tools/sdk/ld)
@@ -104,23 +107,23 @@ build_flags =
   -Wno-return-type
   -Wno-sequence-point
   -Wno-narrowing
-  -Wno-reorder
-  -DMQTT_MAX_PACKET_SIZE=1024 
-  -DSECURE_CLIENT=SECURE_CLIENT_BEARSSL 
+  -DMQTT_MAX_PACKET_SIZE=1024
+  -DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
   -DBEARSSL_SSL_BASIC
   -D CORE_DEBUG_LEVEL=0
   -D NDEBUG
-  #build_flags for the IRremoteESP8266 library (enabled decoders have to appear here) 
-  -D _IR_ENABLE_DEFAULT_=false 
-  -D DECODE_HASH=true 
+  #build_flags for the IRremoteESP8266 library (enabled decoders have to appear here)
+  -D _IR_ENABLE_DEFAULT_=false
+  -D DECODE_HASH=true
   -D DECODE_NEC=true
-  -D DECODE_SONY=true 
+  -D DECODE_SONY=true
   -D DECODE_SAMSUNG=true
   -D DECODE_LG=true
   -DWLED_USE_MY_CONFIG
 
 build_unflags =
   -Wall
+  -Wreorder
   -Wdeprecated-declarations
 
 # enables all features for travis CI
@@ -136,15 +139,15 @@ build_flags_all_features =
 build_flags_esp8266 = ${common.build_flags}  ${esp8266.build_flags}
 build_flags_esp32   = ${common.build_flags}  ${esp32.build_flags}
 
-ldscript_512k = eagle.flash.512k.ld   ;for older versions change this to eagle.flash.512k0.ld 
-ldscript_1m0m = eagle.flash.1m.ld     ;for older versions change this to eagle.flash.1m0.ld 
+ldscript_512k = eagle.flash.512k.ld   ;for older versions change this to eagle.flash.512k0.ld
+ldscript_1m0m = eagle.flash.1m.ld     ;for older versions change this to eagle.flash.1m0.ld
 ldscript_1m128k = eagle.flash.1m128.ld
 ldscript_2m512k = eagle.flash.2m512.ld
 ldscript_2m1m = eagle.flash.2m1m.ld
 ldscript_4m1m = eagle.flash.4m1m.ld
 
 [esp8266]
-build_flags = 
+build_flags =
   -DESP8266
   -DFP_IN_IROM
 ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
@@ -154,9 +157,9 @@ build_flags =
 ; lwIP 1.4 - Higher Bandwidth (Aircoookie has)
    -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
 ; VTABLES in Flash
-  -DVTABLES_IN_FLASH                         
+  -DVTABLES_IN_FLASH
 ; restrict to minimal mime-types
-  -DMIMETYPE_MINIMAL 
+  -DMIMETYPE_MINIMAL
 
 [esp32]
 build_flags = -w -g
@@ -187,15 +190,15 @@ upload_speed = 115200
 # ------------------------------------------------------------------------------
 lib_compat_mode = strict
 lib_deps =
-    FastLED@3.3.2
-    NeoPixelBus@2.6.0
-    ESPAsyncTCP@1.2.0
+    fastled/FastLED @ 3.3.2
+    NeoPixelBus @ 2.6.0
+    ESPAsyncTCP @ 1.2.0
     ESPAsyncUDP
-    AsyncTCP@1.0.3
-    IRremoteESP8266@2.7.3
+    AsyncTCP @ 1.0.3
+    IRremoteESP8266 @ 2.7.3
     https://github.com/lorol/LITTLEFS.git
-    https://github.com/Aircoookie/ESPAsyncWebServer.git@~2.0.0
-  #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line  
+    https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.0
+  #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
     #U8g2@~2.27.2
@@ -228,7 +231,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_512k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_DISABLE_ALEXA -D WLED_DISABLE_BLYNK 
+build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_DISABLE_ALEXA -D WLED_DISABLE_BLYNK
    -D WLED_DISABLE_CRONIXIE -D WLED_DISABLE_HUESYNC -D WLED_DISABLE_INFRARED -D WLED_DISABLE_MQTT -D WLED_DISABLE_WEBSOCKETS
 
 # Unsupported environment due to insufficient flash
@@ -255,7 +258,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} 
+build_flags = ${common.build_flags_esp8266}
 
 [env:d1_mini]
 board = d1_mini
@@ -264,7 +267,7 @@ platform_packages = ${common.platform_packages}
 upload_speed = 921600
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} 
+build_flags = ${common.build_flags_esp8266}
 monitor_filters = esp8266_exception_decoder
 
 [env:heltec_wifi_kit_8]
@@ -287,7 +290,7 @@ build_flags = ${common.build_flags_esp8266} -D LEDPIN=1 -D WLED_DISABLE_INFRARED
 board = esp32dev
 platform = espressif32@2.0
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} 
+build_flags = ${common.build_flags_esp32}
 lib_ignore =
   ESPAsyncTCP
   ESPAsyncUDP
@@ -324,15 +327,15 @@ platform = ${common.platform_wled_default}
 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 -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801 -D WLED_ENABLE_5CH_LEDS 
+build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801 -D WLED_ENABLE_5CH_LEDS
 
 [env:d1_mini_5CH_Shojo_PCB]
 board = d1_mini
 platform = ${common.platform_wled_default}
 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_ANALOG_LEDS -D WLED_USE_SHOJO_PCB -D WLED_ENABLE_5CH_LEDS 
+build_flags = ${common.build_flags_esp8266} -D WLED_USE_ANALOG_LEDS -D WLED_USE_SHOJO_PCB -D WLED_ENABLE_5CH_LEDS
 
 # ------------------------------------------------------------------------------
 # DEVELOPMENT BOARDS
@@ -356,7 +359,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} 
+build_flags = ${common.build_flags_esp8266}
 
 # ------------------------------------------------------------------------------
 # custom board configurations
@@ -376,7 +379,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D LEDPIN=16 
+build_flags = ${common.build_flags_esp8266} -D LEDPIN=16
 
 
 [env:custom_LEDPIN_3]
@@ -446,7 +449,7 @@ lib_ignore =
 board = esp32dev
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39
-lib_ignore = 
+lib_ignore =
 	ESPAsyncTCP
 	ESPAsyncUDP
 platform = espressif32@2.0

platformio_override.ini.example → platformio_override.ini.sample

@@ -18,13 +18,13 @@ build_flags = ${common.build_flags_esp8266}
 ; *** Use custom settings from file my_config.h
    -DWLED_USE_MY_CONFIG
 ; *********************************************************************
-;  -D WLED_DISABLE_OTA 
-;  -D WLED_DISABLE_ALEXA 
+;  -D WLED_DISABLE_OTA
+;  -D WLED_DISABLE_ALEXA
 ;  -D WLED_DISABLE_BLYNK
-;  -D WLED_DISABLE_CRONIXIE 
-;  -D WLED_DISABLE_HUESYNC 
+;  -D WLED_DISABLE_CRONIXIE
+;  -D WLED_DISABLE_HUESYNC
 ;  -D WLED_DISABLE_INFRARED
-;  -D WLED_DISABLE_WEBSOCKETS  
+;  -D WLED_DISABLE_WEBSOCKETS
 ; PIN defines - uncomment and change, if needed:
 ;   -D LEDPIN=2
 ;   -D BTNPIN=0