Merge branch 'MoonModules:mdev' into Strip_Level_Color_Adjust

Author: troyhacks

pio-scripts/output_bins.py

@@ -22,6 +22,88 @@ def _create_dirs(dirs=["firmware", "map"]):
         if not os.path.isdir("{}{}".format(OUTPUT_DIR, d)):
             os.mkdir("{}{}".format(OUTPUT_DIR, d))
 
+
+# trick for py2/3 compatibility
+if 'basestring' not in globals():
+    basestring = str
+
+# WLEDMM : custom print function
+def print_my_item(items, flag = False):
+    if flag: print("  -D", end='')
+    else:    print("  ", end='')
+    if isinstance(items, basestring):
+        # print a single string
+        print(items, end='')
+    else:
+        # print a list
+        first = True
+        for item in items:
+            if not first: print("=", end='')
+            print(item, end='')
+            first = False
+
+# WLEDMM : dump out buildflags : usermods, disable, enable, use_..
+def wledmm_print_build_info(env):
+    all_flags = env["CPPDEFINES"]
+    first = True
+
+    found = False
+    for item in all_flags:
+        if  'WLED_RELEASE_NAME' in item[0] or 'WLED_VERSION' in item[0] or 'ARDUINO_USB_CDC_ON_BOOT' in item[0]:
+            if first: print("\nUsermods and Features:")
+            print_my_item(item)
+            first = False
+            found = True
+    if found: print("")
+
+    found = False
+    for item in all_flags: 
+        if 'USERMOD_' in item or 'UM_' in item:
+            if first: print("\nUsermods and Features:")
+            print_my_item(item)
+            first = False
+            found = True
+    if found: print("")
+
+    found = False
+    for item in all_flags: 
+        if 'WLED_DISABLE' in item or 'WIFI_FIX' in item:
+            if first: print("\nUsermods and Features:")
+            print_my_item(item)
+            first = False
+            found = True
+    if found: print("")
+
+    found = False
+    for item in all_flags:
+        if 'WLED_' in item or 'WLED_' in item[0] or 'MAX_LED' in item[0]:
+            if not 'WLED_RELEASE_NAME' in item[0] and not 'WLED_VERSION' in item[0] and not 'WLED_WATCHDOG_TIMEOUT' in item[0] and not 'WLED_DISABLE' in item and not 'WLED_USE_MY_CONFIG' in item and not 'ARDUINO_PARTITION' in item:
+                if first: print("\nUsermods and Features:")
+                print_my_item(item)
+                first = False
+                found = True
+    if found: print("")
+
+    first = True
+    found = False
+    for item in all_flags: 
+        if 'WLEDMM_' in item[0] or 'WLEDMM_' in item or 'TROYHACKS' in item:
+            if first: print("\nWLEDMM Features:")
+            print_my_item(item)
+            first = False
+            found = True
+    if found: print("\n")
+
+def wledmm_print_all_defines(env):
+    all_flags = env["CPPDEFINES"]
+    found = False
+    for item in all_flags:
+        if not found: print("\nBuild Flags:")
+        print_my_item(item, True)
+        found = True
+    if found: print("\n")
+
+
 def bin_rename_copy(source, target, env):
     _create_dirs()
     variant = env["PIOENV"]
@@ -56,6 +138,9 @@ def bin_rename_copy(source, target, env):
         print(f"Found linker mapfile {source_map}")
         shutil.copy(source_map, map_file)
 
+    # wledmm_print_all_defines(env)
+    # wledmm_print_build_info(env)
+
 def bin_gzip(source, target, env):
     _create_dirs()
     variant = env["PIOENV"]

platformio.ini

@@ -305,6 +305,8 @@ build_flags = -g
   -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
 
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv      ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem
@@ -322,6 +324,7 @@ lib_deps =
   ; 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}
 
 ;; Compatibility with upstream --> you should prefer using ${common_mm.build_flags_S} and ${common_mm.lib_deps_S}
@@ -348,13 +351,16 @@ build_flagsV4 = -g
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE
   -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
+  ; -D WLEDMM_TWOPATH  ;; use I2S1 as the second bus --> slightly faster on some setups
+  ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
   ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
   -D NO_GFX ; Disable the use of Adafruit_GFX by the HUB75 driver
 
 ;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus)
 lib_depsV4 =
   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 !!
   makuna/NeoPixelBus @ 2.7.5
+  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
   ${common_mm.HUB75_lib_deps}
   ${env.lib_deps}
 
@@ -376,10 +382,13 @@ build_flags = -g
   -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
   -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
+  ; -D WLEDMM_TWOPATH  ;; use I2S1 as the second bus --> slightly faster on some setups
+  ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
+  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
   ${env.lib_deps}
 
 [esp32s2]
@@ -406,7 +415,8 @@ build_flags = -g
 
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
-  makuna/NeoPixelBus @ 2.7.5
+  ;; makuna/NeoPixelBus @ 2.7.5 ;; standard
+  makuna/NeoPixelBus @ 2.7.9 ;; experimental - reduces LED glitches on -S2
   ${env.lib_deps}
 
 [esp32c3]
@@ -428,6 +438,7 @@ build_flags = -g
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
+  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
   ${env.lib_deps}
 
 [esp32s3]
@@ -449,6 +460,7 @@ build_flags = -g
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
+  ;; makuna/NeoPixelBus @ 2.7.9 ;; experimental
   ${env.lib_deps}
 
 
@@ -2464,16 +2476,23 @@ lib_ignore =
 
 
 [env:adafruit_matrixportal_esp32s3]
+; ESP32-S3 processor, 8 MB flash, 2 MB of PSRAM, dedicated driver pins for HUB75
 extends = esp32_4MB_V4_M_base
 platform = ${esp32.platformV4_xp} ;; 6.5.0 = first platform release supporting matrixportal
 platform_packages = ${esp32.platformV4_packages_xp} ;; arduino-esp32 2.0.14 needed - previous versions were missing files for matrixportal
 board = adafruit_matrixportal_esp32s3
 
+board_build.partitions = ${esp32.large_partitions}
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+
 build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal" S3 buildenv
+  -D ARDUINO_USB_CDC_ON_BOOT=1                       ;; fix warning: "ARDUINO_USB_CDC_ON_BOOT" redefined; comment out for Serial debug
 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
-  -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
+  ; 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.build_disable_sync_interfaces}

tools/ESP32-Chip_info.hpp

@@ -543,6 +543,8 @@ void show_psram_info_part2(void)
 
 void showRealSpeed() {
   //Serial.begin(115200);
+  if (!Serial) return; // Avoid writing to unconnected USB-CDC
+
   Serial.flush();
   Serial.println(F("\n"));
   for(int aa=0; aa<65; aa++) Serial.print("="); Serial.println();

usermods/audioreactive/audio_reactive.h

@@ -1,5 +1,24 @@
 #pragma once
 
+/* 
+   @title     MoonModules WLED - audioreactive usermod
+   @file      audio_reactive.h
+   @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
+   @Authors   https://github.com/MoonModules/WLED/commits/mdev/
+   @Copyright © 2024 Github MoonModules Commit Authors (contact [email protected] for details)
+   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+     This file is part of the MoonModules WLED fork also known as "WLED-MM".
+     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
+     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+
 #include "wled.h"
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -353,9 +372,6 @@ constexpr uint16_t samplesFFT_2 = 256;          // meaningfull part of FFT resul
 // These are the input and output vectors.  Input vectors receive computed results from FFT.
 static float vReal[samplesFFT] = {0.0f};       // FFT sample inputs / freq output -  these are our raw result bins
 static float vImag[samplesFFT] = {0.0f};       // imaginary parts
-#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-static float windowWeighingFactors[samplesFFT] = {0.0f};
-#endif
 
 #ifdef FFT_MAJORPEAK_HUMAN_EAR
 static float pinkFactors[samplesFFT] = {0.0f};              // "pink noise" correction factors
@@ -381,7 +397,14 @@ constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range o
 #include <arduinoFFT.h>
 
 #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
+#if defined(FFT_LIB_REV) && FFT_LIB_REV > 0x19
+  // arduinoFFT 2.x has a slightly different API
+  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, true);
+#else
+  // recommended version optimized by @softhack007 (API version 1.9)
+  static float windowWeighingFactors[samplesFFT] = {0.0f}; // cache for FFT windowing factors
+  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
+#endif
 #else
 static arduinoFFT FFT = arduinoFFT(vReal, vImag, samplesFFT, SAMPLE_RATE);
 #endif
@@ -627,9 +650,14 @@ void FFTcode(void * parameter)
         #endif
 
         #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
+        #if defined(FFT_LIB_REV) && FFT_LIB_REV > 0x19
+          // arduinoFFT 2.x has a slightly different API
+          FFT.majorPeak(&FFT_MajorPeak, &FFT_Magnitude);
+        #else
           FFT.majorPeak(FFT_MajorPeak, FFT_Magnitude);                // let the effects know which freq was most dominant
+        #endif
         #else
-        FFT.MajorPeak(&FFT_MajorPeak, &FFT_Magnitude);              // let the effects know which freq was most dominant
+          FFT.MajorPeak(&FFT_MajorPeak, &FFT_Magnitude);
         #endif
 
         if (FFT_MajorPeak < (SAMPLE_RATE /  samplesFFT)) {FFT_MajorPeak = 1.0f; FFT_Magnitude = 0;}                  // too low - use zero
@@ -921,7 +949,7 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
         if (post_gain < 1.0f) post_gain = ((post_gain -1.0f) * 0.8f) +1.0f;
         currentResult *= post_gain;
       }
-      fftResult[i] = constrain((int)currentResult, 0, 255);
+      fftResult[i] = max(min((int)(currentResult+0.5f), 255), 0);  // +0.5 for proper rounding
     }
 }
 ////////////////////
@@ -1571,7 +1599,7 @@ class AudioReactive : public Usermod {
       transmitData.zeroCrossingCount = zeroCrossingCount;
 
       for (int i = 0; i < NUM_GEQ_CHANNELS; i++) {
-        transmitData.fftResult[i] = (uint8_t)constrain(fftResult[i], 0, 254);
+        transmitData.fftResult[i] = fftResult[i];
       }
 
       transmitData.FFT_Magnitude = my_magnitude;

usermods/audioreactive/audio_source.h

@@ -1,4 +1,25 @@
 #pragma once
+
+/* 
+   @title     MoonModules WLED - audioreactive usermod
+   @file      audio_source.h
+   @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
+   @Authors   https://github.com/MoonModules/WLED/commits/mdev/
+   @Copyright © 2024 Github MoonModules Commit Authors (contact [email protected] for details)
+   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+     This file is part of the MoonModules WLED fork also known as "WLED-MM".
+     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
+     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+
 #ifdef ARDUINO_ARCH_ESP32
 #include <Wire.h>
 #include "wled.h"

usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h

@@ -1,5 +1,25 @@
 #pragma once
 
+/* 
+   @title     MoonModules WLED - auto-playlist usermod
+   @file      usermod_v2_auto_playlist.h
+   @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
+   @Authors   https://github.com/MoonModules/WLED/commits/mdev/
+   @Copyright © 2024 Github MoonModules Commit Authors (contact [email protected] for details)
+   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+     This file is part of the MoonModules WLED fork also known as "WLED-MM".
+     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
+     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+
 #ifdef WLED_DEBUG
   #ifndef USERMOD_AUTO_PLAYLIST_DEBUG
     #define USERMOD_AUTO_PLAYLIST_DEBUG
@@ -302,6 +322,8 @@ class AutoPlaylistUsermod : public Usermod {
 
       if (bri == 0) return;
 
+      if(!functionality_enabled) return;
+
       um_data_t *um_data;
 
       if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {