Merge branch 'mdev' into HUB75-VirtualMatrixPanel

Author: netmindz

platformio.ini

@@ -48,19 +48,22 @@
 ; ===================
 
 default_envs = 
-  esp32_4MB_S       ;; experimental, optimized for speed
-  esp32_4MB_M       ;; esp32 recommended default
-  esp32_4MB_M_eth
-  esp32_4MB_M_debug
-  esp32_4MB_XL
-  ; esp32_16MB_S    ;; experimental, optimized for speed
-  esp32_16MB_M      ;; esp32 recommended for boards with 16MB flash
-  esp32_16MB_M_eth
-  ; esp32_16MB_M_debug
-  ; esp32_16MB_XL
-  esp32_pico_4MB_M
+; Netmindz: Disable the non-V4 envs as we only build using V4 now, TBC if we rename thr _V4 to be without and delete existing
+;  or maintain the _V4 as we have "trained" our users that certain things are _V4 only plus the bootloader issue if you OTA from V3 to a V4
+
+  ; esp32_4MB_S       ;; experimental, optimized for speed
+  ; esp32_4MB_M       ;; esp32 recommended default
+  ; esp32_4MB_M_eth
+  ; esp32_4MB_M_debug
+  ; esp32_4MB_XL
+  ; ; esp32_16MB_S    ;; experimental, optimized for speed
+  ; esp32_16MB_M      ;; esp32 recommended for boards with 16MB flash
+  ; esp32_16MB_M_eth
+  ; ; esp32_16MB_M_debug
+  ; ; esp32_16MB_XL
+  ; esp32_pico_4MB_M
   ;;
-  wemos_shield_esp32_4MB_M
+  ; wemos_shield_esp32_4MB_M
   ; wemos_shield_esp32_4MB_ICS4343x_M
   ; wemos_shield_esp32_4MB_SPM1423_M
   ; wemos_shield_esp32_4MB_LineIn_M
@@ -126,11 +129,6 @@ extra_configs =
 #   arduino core 2.6.3 = platformIO 2.3.2
 #   arduino core 2.7.0 = platformIO 2.5.0
 # ------------------------------------------------------------------------------
-arduino_core_2_6_3 = espressif8266@2.3.3
-arduino_core_2_7_4 = espressif8266@2.6.2
-arduino_core_3_0_0 = espressif8266@3.0.0
-arduino_core_3_2_0 = espressif8266@3.2.0
-arduino_core_4_1_0 = espressif8266@4.1.0
 arduino_core_3_1_2 = espressif8266@4.2.1
 
 # Development platforms
@@ -145,13 +143,6 @@ platform_packages = platformio/toolchain-xtensa @ ~2.100300.220621 #2.40802.2005
                     platformio/tool-esptool #@ ~1.413.0
                     platformio/tool-esptoolpy #@ ~1.30000.0
 
-## previous platform for 8266, in case of problems with the new one
-## you'll need  makuna/NeoPixelBus@ 2.6.9 for arduino_core_3_2_0, which does not support Ucs890x
-;; platform_wled_default = ${common.arduino_core_3_2_0}
-;; 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
@@ -212,7 +203,7 @@ build_flags =
 build_unflags =
 
 build_flags_esp8266 = ${common.build_flags}  ${esp8266.build_flags}
-build_flags_esp32   = ${common.build_flags}  ${esp32.build_flags}
+build_flags_esp32   = ${common.build_flags}  ${esp32_idf_V4.build_flags}
 build_flags_esp32_V4= ${common.build_flags}  ${esp32_idf_V4.build_flags}
 
 ldscript_1m128k = eagle.flash.1m128.ld
@@ -260,7 +251,9 @@ lib_deps =
     ;; https://github.com/softhack007/FastLED.git#ESP32-C6 ;; patched version needed for -C6
     IRremoteESP8266 @ 2.8.2
     ;;makuna/NeoPixelBus @ 2.7.5 ;; WLEDMM will be added in board specific sections
-    https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1  ;; newer with bugfixes and stability improvements
+    https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.4.0
+    bitbank2/AnimatedGIF@^1.4.7
+    https://github.com/Aircoookie/GifDecoder#bc3af18
   #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
     #TFT_eSPI
   #For compatible OLED display uncomment following
@@ -301,7 +294,8 @@ build_flags =
   ; -D PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED ;; (experimental) adds some extra heap, but may cause slowdown
   -D USERMOD_AUDIOREACTIVE
   -D NON32XFER_HANDLER ;; ask forgiveness for PROGMEM misuse
-
+  -D WLED_DISABLE_PARTICLESYSTEM2D
+  
 lib_deps =
   #https://github.com/lorol/LITTLEFS.git
   ESPAsyncTCP @ 1.2.2
@@ -330,33 +324,12 @@ platform_packages_compat =
                     platformio/tool-esptool #@ ~1.413.0
                     platformio/tool-esptoolpy #@ ~1.30000.0
 
-;; experimental - for using older NeoPixelBus 2.7.9
-lib_deps_compat =
-  ESPAsyncTCP @ 1.2.2
-  ESPAsyncUDP
-  ESP8266PWM
-  fastled/FastLED @ 3.6.0
-  IRremoteESP8266 @ 2.8.2
-  makuna/NeoPixelBus @ 2.7.9
-  https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1
 
 
 [esp32]
-#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
-platform = espressif32@3.5.0
-
-platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
-
-build_flags = -g
-  -DARDUINO_ARCH_ESP32
-  #-DCONFIG_LITTLEFS_FOR_IDF_3_2
-  -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472                ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
-  #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
-  -D LOROL_LITTLEFS
-  ; -D WLEDMM_TWOPATH    ;; use I2S1 as the second bus --> ~15% faster on "V3" builds - may flicker a bit more
-  ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
-  ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
+platform             = ${esp32_idf_V4.platform}
+platform_packages    = ${esp32_idf_V4.platform_packages}
+build_flags          = ${esp32_idf_V4.build_flags}
 
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv      ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem
 ;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; WLEDMM alternative for 4MB flash:   1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing)
@@ -367,14 +340,7 @@ big_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv     ;; 1.8MB firmware, 256KB
 large_partitions = tools/WLED_ESP32_8MB.csv
 extreme_partitions = tools/WLED_ESP32_16MB_9MB_FS.csv
 
-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
-  makuna/NeoPixelBus @ 2.7.5
-  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
-  ${env.lib_deps}
+lib_deps = ${esp32_idf_V4.lib_deps}
 
 ;; Compatibility with upstream --> you should prefer using ${common_mm.build_flags_S} and ${common_mm.lib_deps_S}
 AR_build_flags = ${common_mm.AR_build_flags}
@@ -417,9 +383,6 @@ lib_depsV4 =
 ;; WLEDMM end
 
 [esp32_idf_V4]
-;; experimental build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
-;; very similar to the normal ESP32 flags, but omitting Lorol LittleFS, as littlefs is included in the new framework already.
-;;
 ;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
 ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
 
@@ -1071,7 +1034,7 @@ AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLE
 AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2      ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
 
 animartrix_build_flags = -D USERMOD_ANIMARTRIX ;; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
-animartrix_lib_deps = https://github.com/netmindz/animartrix.git#657f754783268b648e1d56b3cd31c810379d0c89 ;; Dirty state fix
+animartrix_lib_deps = https://github.com/netmindz/animartrix.git#bd556cef92a6fee9777c0a7304c9de1a84cba184 ;; init state fix
 animartrix_lib_ignore = animartrix ;; to remove the animartrix lib dependancy (saves a few bytes)
 
 DMXin_build_flags = -D WLED_ENABLE_DMX_INPUT  ;; WLEDMM DMX physical input - requires ESP-IDF v4.4.x
@@ -1108,6 +1071,7 @@ build_flags_S =
   ; -D USERMOD_ARTIFX  ;; WLEDMM usermod - temporarily moved into "_M", due to problems in "_S" when compiling with -O2
   -D WLEDMM_FASTPATH ;; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
   ; -D WLED_DEBUG_HEAP ;; WLEDMM enable heap debugging
+  -D WLED_ENABLE_GIF
 
 lib_deps_S =
   ;; https://github.com/kosme/arduinoFFT#develop @ 1.9.2+sha.419d7b0 ;; used for USERMOD_AUDIOREACTIVE - using "known working" hash
@@ -1613,6 +1577,9 @@ build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
   -D WLED_DISABLE_HUESYNC
   -D WLED_DISABLE_ESPNOW   ;; exceeds flash size limits
   -D WLED_DISABLE_INFRARED ;; exceeds flash size limits
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
+  -D WLED_DISABLE_PARTICLESYSTEM2D ;; exceeds flash size limit
+
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ; RAM:   [======    ]  60.6% (used 49616 bytes from 81920 bytes)
@@ -1643,12 +1610,36 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
   ${common_mm.HUB75_build_flags}
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
 lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
     ${common_mm.HUB75_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ; RAM:   [===       ]  25.5% (used 83400 bytes from 327680 bytes)
 ; Flash: [==========]  97.3% (used 1530013 bytes from 1572864 bytes)
 
+[env:esp32_4MB_V4_S_eth]
+extends = esp32_4MB_V4_S_base
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
+  -D WLED_RELEASE_NAME=esp32_4MB_V4_S
+  -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
+  -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
+  -D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  -D WLEDMM_SAVE_FLASH
+  -D WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_INFRARED
+  ; -D WLED_DEBUG
+  ; -D SR_DEBUG
+  ; -D MIC_LOGGER
+  ${common_mm.HUB75_build_flags}
+  -D WLED_USE_ETHERNET
+  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
+    ${common_mm.HUB75_lib_deps}
+lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+
 ;; softhack007: my favourite HUB75 buildenv - fastest possible
 [env:esp32_4MB_V4_HUB75_forum]
 extends = esp32_4MB_V4_S_base
@@ -2231,6 +2222,8 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
+  -D WLED_DISABLE_PARTICLESYSTEM2D ;; exceeds flash size limit
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
 lib_ignore =
   IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -2439,7 +2432,8 @@ build_flags = ${common.build_flags} ${esp32c3.build_flags}
   ;-D HW_PIN_SDA=0 -D HW_PIN_SCL=1 ;; for I2C Qwiic connector
   -D SR_DMTYPE=1 -D I2S_SDPIN=5 -D I2S_WSPIN=6 -D I2S_CKPIN=4 -D MCLK_PIN=7
   ; -D WLED_USE_MY_CONFIG
-
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
+  -D WLED_DISABLE_PARTICLESYSTEM2D ;; exceeds flash size limit
 lib_deps = ${esp32c3.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M}
 lib_ignore = 
   ;IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -2463,6 +2457,8 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
   -D WLED_DISABLE_BROWNOUT_DET    ;; the board only has a 500mA LDO, better to disable brownout detection
   -D WLED_DISABLE_ADALIGHT        ;; to disable serial protocols for boards with CDC USB (Serial RX will receive junk commands, unless its pulled down by resistor)
   -D HW_PIN_SDA=0 -D HW_PIN_SCL=1 ;; avoid pin conflicts
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
+  -D WLED_DISABLE_PARTICLESYSTEM2D ;; exceeds flash size limit
 ; RAM:   [==        ]  24.6% (used 80556 bytes from 327680 bytes)
 ; Flash: [==========]  97.3% (used 1530346 bytes from 1572864 bytes)
 
@@ -2489,7 +2485,8 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
   -D WLED_DISABLE_BROWNOUT_DET    ;; the board only has a 500mA LDO, better to disable brownout detection
   -D WLED_DISABLE_ADALIGHT        ;; to disable serial protocols for boards with CDC USB (Serial RX will receive junk commands, unless its pulled down by resistor)
   -D HW_PIN_SDA=0 -D HW_PIN_SCL=1 ;; avoid pin conflicts
-
+  -D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
+  -D WLED_DISABLE_PARTICLESYSTEM2D ;; exceeds flash size limit
 ; RAM:   [==        ]  24.0% (used 78676 bytes from 327680 bytes)
 ; Flash: [==========]  96.4% (used 1516068 bytes from 1572864 bytes)
 
@@ -2725,7 +2722,7 @@ build_flags = ${esp32_4MB_S_base.build_flags}
 [env:esp32_pico_4MB_M]
 extends = esp32_4MB_M_base
 board = pico32
-board_build.flash_mode = dout ;; (dout = dual out; more compatible than qio = quad i/o)
+board_build.flash_mode = dio ;; (dout = dual out; more compatible than qio = quad i/o)
 upload_speed = 256000 ;; or 115200 ;; or 460800 ; or 921600  (slower speeds are better when flashing without a soldered connection)
 
 build_flags = ${esp32_4MB_M_base.build_flags}
@@ -2815,7 +2812,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; Serial debug enabled  -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1 ;; for Hardware-CDC USB mode
   -D ARDUINO_USB_CDC_ON_BOOT=0
   -D WLED_DISABLE_ADALIGHT     ;; disables serial protocols - recommended for Hardware-CDC USB (Serial RX will receive junk commands when RX pin is unconnected, unless its pulled down by resistor)
-  ${common_mm.animartrix_build_flags}
+  ; ${common_mm.animartrix_build_flags}
   ${common_mm.build_disable_sync_interfaces}
   -D LOLIN_WIFI_FIX ;; try this in case Wifi does not work
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
@@ -2825,7 +2822,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ${common_mm.HUB75_build_flags}
   -D DEFAULT_LED_TYPE=101
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S} ;; ;;  do not include ${esp32.lib_depsV4} !!!!
-  ${common_mm.animartrix_lib_deps}
+  ; ${common_mm.animartrix_lib_deps}
   ${common_mm.HUB75_lib_deps}
 
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation

usermods/BME280_v2/usermod_bme280.h

@@ -245,7 +245,7 @@ class UsermodBME280 : public Usermod
         // from the UI and values read from sensor, then publish to broker
         if (temperature != lastTemperature || PublishAlways)
         {
-          publishMqtt("temperature", String(temperature, TemperatureDecimals).c_str());
+          publishMqtt("temperature", String(temperature, (unsigned)TemperatureDecimals).c_str());
         }
 
         lastTemperature = temperature; // Update last sensor temperature for next loop
@@ -258,17 +258,17 @@ class UsermodBME280 : public Usermod
 
           if (humidity != lastHumidity || PublishAlways)
           {
-            publishMqtt("humidity", String(humidity, HumidityDecimals).c_str());
+            publishMqtt("humidity", String(humidity, (unsigned)HumidityDecimals).c_str());
           }
 
           if (heatIndex != lastHeatIndex || PublishAlways)
           {
-            publishMqtt("heat_index", String(heatIndex, TemperatureDecimals).c_str());
+            publishMqtt("heat_index", String(heatIndex, (unsigned)TemperatureDecimals).c_str());
           }
 
           if (dewPoint != lastDewPoint || PublishAlways)
           {
-            publishMqtt("dew_point", String(dewPoint, TemperatureDecimals).c_str());
+            publishMqtt("dew_point", String(dewPoint, (unsigned)TemperatureDecimals).c_str());
           }
 
           lastHumidity = humidity;
@@ -285,7 +285,7 @@ class UsermodBME280 : public Usermod
 
         if (pressure != lastPressure || PublishAlways)
         {
-          publishMqtt("pressure", String(pressure, PressureDecimals).c_str());
+          publishMqtt("pressure", String(pressure, (unsigned)PressureDecimals).c_str());
         }
 
         lastPressure = pressure;