Merge branch 'MoonModules:mdev' into Strip_Level_Color_Adjust

Author: troyhacks

.github/ISSUE_TEMPLATE/bug.yml

@@ -48,7 +48,7 @@ body:
     attributes:
       label: What version/release of MM WLED?
       description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
-      placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b31.38_esp32_4MB_M.bin"
+      placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b32.40_esp32_4MB_M.bin"
     validations:
       required: true
   - type: dropdown

.github/workflows/wled-ci.yml

@@ -8,15 +8,15 @@ jobs:
     name: Gather Environments
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
     - name: Install PlatformIO
@@ -38,21 +38,24 @@ jobs:
       matrix:
         environment: ${{ fromJSON(needs.get_default_envs.outputs.environments) }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.environment}}
+
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
           python-version: '3.9'
     - name: Install PlatformIO
@@ -61,26 +64,28 @@ jobs:
       env:
         WLED_RELEASE: True
       run: pio run -e ${{ matrix.environment }}
-    - uses: actions/upload-artifact@v2
+    - name: Rename Bin
+      run: mv -v .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin
+    - uses: actions/upload-artifact@v4
       with:
         name: firmware-${{ matrix.environment }}
-        path: |
-          build_output/firmware/*.bin
-          build_output/firmware/*.gz
-    - uses: actions/upload-artifact@v2
+        path: firmware-${{ matrix.environment }}.bin
+    - uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: firmware-release
+        name: firmware-release-${{ matrix.environment }}
         path: build_output/release/*.bin
   release:
     name: Create Release
     runs-on: ubuntu-latest
     needs: [get_default_envs, build]
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
-        name: firmware-release
+        name: firmware-release-*
+    - name: List Artifacts
+      run: find ./
     - name: Create draft release
       uses: softprops/action-gh-release@v1
       with:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.1-b31.38",
+  "version": "0.14.1-b32.41.dev",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

package.json

@@ -72,6 +72,7 @@ default_envs =
   esp32_pico_4MB_M
   esp32_4MB_PSRAM_S
   ; esp32_4MB_PSRAM_REV3_S ;; experimental, optimized for WROVER-E with "revision3" chip
+  esp32S3_4MB_S
   esp32S3_8MB_S            ;; experimental, optimized for speed
   esp32S3_8MB_M
   esp32S3_4MB_PSRAM_S      ;; for lolin s3 mini, S3 zero, S3 super mini - optimized for speed
@@ -80,10 +81,11 @@ default_envs =
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
   esp32s2_PSRAM_M          ;; experimental
   esp32c3dev_4MB_M         ;; experimental
+  esp32c3dev_2MB_M         ;; experimental - 2MB Flash, no OTA
   esp32c3mini_dio_4MB_M    ;; for boards that need "dio" flash mode (instead of qio)
   seeed_esp32c3_4MB_S      ;; experimental
   esp32_4MB_V4_S           ;; experimental
-  esp32_16MB_V4_S          ;; experimental, optimized for speed
+  esp32_16MB_V4_S          ;; experimental - optimized for speed
   esp32_16MB_V4_M          ;; experimental
   esp32_16MB_V4_M_debug    ;; experimental
   esp32_pico_4MB_V4_S      ;; experimental - may work better in case you experience wifi connectivity problems
@@ -186,6 +188,7 @@ build_flags =
   -D DECODE_SONY=true
   -D DECODE_SAMSUNG=true
   -D DECODE_LG=true
+  -D FASTLED_NO_FASTLED
   ;-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library ;; warning: this breaks framework code on ESP32-C3 and ESP32-S2
   -DWLED_USE_MY_CONFIG
   ; -D USERMOD_SENSORSTOMQTT
@@ -239,6 +242,8 @@ upload_speed = 115200
 lib_compat_mode = strict
 lib_deps =
     fastled/FastLED @ 3.6.0
+    ;; fastled/FastLED @ 3.7.1
+    ;; 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 @ ~2.0.7
@@ -1029,9 +1034,16 @@ DMXin_lib_deps = https://github.com/someweisguy/esp_dmx.git#47db25d  ;; for DMX_
 DMXin_lib_ignore = esp_dmx ;; to remove the esp-dmx lib dependancy (saves a few bytes)
 
 HUB75_build_flags =
-  -D WLED_ENABLE_HUB75MATRIX ;-D SPIRAM_FRAMEBUFFER ;; WLEDMM HUB75 support - requires ESP-IDF v4.4.x
-  -D NO_GFX ; Disable the use of Adafruit_GFX by the HUB75 driver
-HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
+  -D WLED_ENABLE_HUB75MATRIX ;; - requires ESP-IDF v4.4.x
+   ;-D SPIRAM_FRAMEBUFFER ;; ONLY SUPPORTED ON ESP32-S3 VARIANTS WITH OCTAL (not quad) SPIRAM/PSRAM
+  -D NO_GFX ;; Disable the use of Adafruit_GFX by the HUB75 driver
+  -D NO_FAST_FUNCTIONS ;; If you are not using AdafruitGFX than you probably do not need this either, save memory/code size
+  -D NO_CIE1931 ;; Do not use LED brightness compensation described in CIE 1931. We use FastLED dimming already
+  -D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
+;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.11 ;; breaks the build (2024-07-30)
+;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; 3.0.10 - something strange is going on here ...
+;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; 3.0.10 - something strange is going on here ...
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#c4ecdcfeeb5aa668d92ddf3c3c74bc93316f6e10 ;;  3.0.11
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =
@@ -1594,6 +1606,67 @@ lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
  ; RAM:   [===       ]  28.1% (used 91960 bytes from 327680 bytes)
  ; Flash: [==========]  97.8% (used 1537777 bytes from 1572864 bytes)
+
+;; softhack007: my favourite HUB75 buildenv - fastest possible
+[env:esp32_4MB_V4_HUB75_forum]
+extends = esp32_4MB_V4_S_base
+platform_packages = ${esp32_4MB_V4_S_base.platform_packages}
+;;  toolchain-xtensa-esp32@~11.2 ;; for trying out newer gcc @11.2.0+2022r1       ;; 25fps -> 30fps;;  FastLED 3.7.1 required !!
+
+build_unflags = ${esp32_4MB_V4_S_base.build_unflags}
+  ${Speed_Flags.build_unflags}  ;; to override -Os
+  ;; -D WLED_ENABLE_DMX_INPUT
+  -DARDUINO_EVENT_RUNNING_CORE=1
+  ;;-DCORE_DEBUG_LEVEL=0
+  ;; -D NDEBUG
+  -D NO_CIE1931 ;; Do use LED brightness compensation described in CIE 1931
+
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
+  ;; -Wsuggest-attribute=const -Wsuggest-attribute=pure
+  ;; -Wmissing-noreturn -Wmissing-return
+  ;; -Wall -Wextra 
+  -Wno-unused-value -Wno-format -Wno-type-limits
+  -D WLED_RELEASE_NAME=esp32_4MB_V4_HUB75
+  ${Speed_Flags.build_flags}  ;; -O2 -> optimize for speed instead of size
+  ;; -D DEBUG
+  -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 WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_ADALIGHT
+  ;; -D WLED_DEBUG
+  ;; -D SR_DEBUG
+  -D WLED_BOOTUPDELAY=350
+  -D WLED_ENABLE_HUB75MATRIX -DESP32_FORUM_PINOUT 
+  ;; -D HUB75_NO_DOUBLEBUFFER ;; -D PIXEL_COLOUR_DEPTH_BITS=12
+  ${common_mm.animartrix_build_flags}
+  ;;-DARDUINO_EVENT_RUNNING_CORE=0  ;; assign Wifi to core0, to have more CPU on core#1 (arduino loop)
+  ;;-DARDUINO_RUNNING_CORE=1        ;; should be default, but does not hurt
+  -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - seems to move more buffers into PSRAM
+  ;; -D CONFIG_ESP32_REV_MIN=3  ;;  disables PSRAM bug workarounds in the core, reducing the code size and improving overall performance.
+  -D JSON_BUFFER_SIZE=18432 -D MIN_HEAP_SIZE=6144
+  -D MAX_SEGMENT_DATA=40960  ;; default 32767
+  -D WLEDMM_SAVE_FLASH
+  -D WLED_DISABLE_BROWNOUT_DET
+  ;;-DCORE_DEBUG_LEVEL=1
+  ;;-D WLED_DISABLE_PARTICLESYSTEM1D
+  ;;-D WLED_DISABLE_PARTICLESYSTEM2D
+  ;;-D WLED_DISABLE_PARTICLESYSTEM_BUFFER
+
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
+    ${common_mm.animartrix_lib_deps}
+lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+  ;; ${common_mm.DMXin_lib_ignore}
+
+board_build.partitions = ${esp32.big_partitions}
+board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz) 
+board_build.flash_mode = qio ; (dio = dual i/o; more compatible than qio = quad i/o)
+
+
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_4MB_V4_M]
 extends = esp32_4MB_V4_M_base
@@ -1780,6 +1853,32 @@ lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 # ------------------------------------------------------------------------------
 # esp32-S3 environments
 # ------------------------------------------------------------------------------
+[env:esp32S3_4MB_S] ;; Use for HD-WF2
+extends = esp32_4MB_V4_M_base
+board = esp32-s3-devkitc-1
+build_unflags = 
+  -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
+  -D USE_ALT_DISPLAY ;; four line display seems to have problems with I2C - it hangs during usermod setup
+  -D USERMOD_FOUR_LINE_DISPLAY ;; see above
+  -D USERMOD_ROTARY_ENCODER_UI ;; see above
+  -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
+
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
+  ${common_mm.build_flags_S} 
+  ${common_mm.HUB75_build_flags}
+  ${common_mm.animartrix_build_flags}
+  -D WLED_RELEASE_NAME=esp32S3_4MB_S 
+  -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0   ;; for Serial-to-USB chip
+  ;;-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 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)
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
+  ${common_mm.build_disable_sync_interfaces}
+  -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
+  ; -D SR_DEBUG
+lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}
+    ${common_mm.HUB75_lib_deps}
+    ${common_mm.animartrix_lib_deps}
 
 
 [env:esp32S3_8MB_M]
@@ -1794,6 +1893,8 @@ build_unflags =
 
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
+  ${common_mm.HUB75_build_flags}
+  ${common_mm.animartrix_build_flags}
   ; -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON -D WLED_USE_PSRAM ;; un-comment in case your board supports PSRAM
   -D WLED_RELEASE_NAME=esp32S3_8MB_M 
   -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0   ;; for Serial-to-USB chip
@@ -1821,6 +1922,9 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
+     ${common_mm.HUB75_lib_deps}
+     ${common_mm.animartrix_lib_deps}
+
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 board_build.partitions = tools/WLED_ESP32_8MB.csv
 board_build.flash_mode = qio
@@ -2101,7 +2205,6 @@ monitor_filters = esp32_exception_decoder
 ; RAM:   [==        ]  21.8% (used 71304 bytes from 327680 bytes)
 ; Flash: [========  ]  84.0% (used 1596970 bytes from 1900544 bytes)
 
-
 # ------------------------------------------------------------------------------
 # esp32-C3 environments
 # ------------------------------------------------------------------------------
@@ -2180,6 +2283,33 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
 ; RAM:   [===       ]  25.8% (used 84700 bytes from 327680 bytes)
 ; Flash: [==========]  98.7% (used 1552582 bytes from 1572864 bytes)
 
+[env:esp32c3dev_2MB_M]
+extends = env:esp32c3dev_4MB_M
+board = lolin_c3_mini
+;;; replace WLED_RELEASE_NAME, disable CDC_ON_BOOT
+build_unflags = ${env:esp32c3dev_4MB_M.build_unflags}
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -D WLED_RELEASE_NAME=esp32c3dev_4MB_M
+
+;;; 2MB Flash, no OTA
+board_build.partitions = tools/WLED_ESP32_2MB_noOTA.csv
+board_build.flash_mode = dio
+board_upload.flash_size = 2MB
+board_upload.maximum_size = 2097152
+
+build_flags = ${env:esp32c3dev_4MB_M.build_flags}
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -D WLED_DISABLE_OTA
+  ; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
+  -DARDUINO_USB_CDC_ON_BOOT=0   ;; for serial-to-USB chip
+  -D WLED_RELEASE_NAME=esp32c3dev_2MB_M
+  -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
+
+; RAM:   [===       ]  25.3% (used 82828 bytes from 327680 bytes)
+; Flash: [==========]  97.9% (used 1540138 bytes from 1572864 bytes)
+
 ;; MM environment for "seeed xiao -C3" boards
 [env:seeed_esp32c3_4MB_S]
 extends = env:esp32c3dev_4MB_M
@@ -2362,12 +2492,17 @@ board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for
 ;https://www.athom.tech/blank-1/wled-esp32-music-addressable-led-strip-controller
 [env:athom_music_esp32_4MB_M]
 extends = esp32_4MB_M_base
+build_unflags = ${common.build_unflags}
+  -D USERMOD_ARTIFX ;; disabled to save some program space in flash
+  -D USERMOD_DALLASTEMPERATURE ;; disabled - flash space is too tight for this
+  -D USERMOD_ROTARY_ENCODER_UI ;; see above
 build_flags = ${esp32_4MB_M_base.build_flags} 
   ${Athom_PDMmic.build_flags}
   -D WLED_AP_SSID_UNIQUE
   -D WLED_RELEASE_NAME=athom_music_esp32_4MB_M
   -D ABL_MILLIAMPS_DEFAULT=14500 ; max 15A
-  -D WLED_DISABLE_MQTT -D WLED_DISABLE_LOXONE 
+  ; -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_LOXONE
   -D WLED_DISABLE_ADALIGHT ;to get 4ld working
   -D BTNPIN=0 -D RLYPIN=2 -D IRPIN=25 -D IRTYPE=9 -D LEDPIN=18
   -D AUDIOPIN=-1 
@@ -2379,8 +2514,9 @@ build_flags = ${esp32_4MB_M_base.build_flags}
   ; -D PIR_SENSOR_PIN=-1
   ; -D PWM_PIN=-1
   ; -D WLED_USE_MY_CONFIG
-; RAM:   [===       ]  25.9% (used 84948 bytes from 327680 bytes)
-; Flash: [==========]  95.9% (used 1509113 bytes from 1572864 bytes)
+  -D WLEDMM_SAVE_FLASH
+; RAM:   [===       ]  26.3% (used 86204 bytes from 327680 bytes)
+; Flash: [========= ]  93.6% (used 1471681 bytes from 1572864 bytes)
 
 ;https://shop.myhome-control.de/Elektronik/
 [env:abc_wled_controller_v43_S]
@@ -2491,6 +2627,7 @@ build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal"
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S}
   -D WLED_RELEASE_NAME=matrixportal_esp32s3
+  -D SERVERNAME='"WLED-MatrixPortalS3"'
   ; 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)

platformio.ini

@@ -76,7 +76,7 @@ class Usermod_BH1750 : public Usermod
   bool sensorFound = false;
 
   // Home Assistant and MQTT  
-  String mqttLuminanceTopic = FPSTR("");
+  String mqttLuminanceTopic;
   bool mqttInitialized = false;
   bool HomeAssistantDiscovery = true; // Publish Home Assistant Discovery messages