Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MoonModules:mdev' into downsample4x

Browse Source
This commit is contained in:
Troy
2023-09-15 14:41:17 -04:00
committed by GitHub
parent a462242544 c276515f5a
commit 03f7d5e6e8
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
platformio.ini
View File

@@ -1801,6 +1801,7 @@ monitor_filters = esp32_exception_decoder
; Flash: [==========] 97.9% (used 1411114 bytes from 1441792 bytes) !!! 98% ; Flash: [==========] 97.9% (used 1411114 bytes from 1441792 bytes) !!! 98%
;; MM environment for generic ESP32-S2, with PSRAM, 4MB flash (300kB filesystem to have more program space) ;; MM environment for generic ESP32-S2, with PSRAM, 4MB flash (300kB filesystem to have more program space)
;; PINs assignments optimized for use with serg74 "mini shield"
[env:esp32s2_PSRAM_M] [env:esp32s2_PSRAM_M]
extends = esp32_4MB_V4_M_base extends = esp32_4MB_V4_M_base
platform = ${esp32.platformV4} ;; more stable on -S2 than 5.1.1 platform = ${esp32.platformV4} ;; more stable on -S2 than 5.1.1
@@ -1812,41 +1813,41 @@ board_build.flash_mode = dio
upload_speed = 256000 ;; 921600 upload_speed = 256000 ;; 921600
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DARDUINO_USB_DFU_ON_BOOT=0
-D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?) -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
-D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX) -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
-D WLED_ENABLE_DMX_INPUT ;; needs more testing -D WLED_ENABLE_DMX_INPUT ;; needs more testing
build_flags = ${common.build_flags} ${esp32s2.build_flags} build_flags = ${common.build_flags} ${esp32s2.build_flags}
${Debug_Flags.build_flags} ;; ${Debug_Flags.build_flags}
-D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0 -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
${common_mm.build_flags_S} ${common_mm.build_flags_M} ${common_mm.build_flags_S} ${common_mm.build_flags_M}
-Wno-misleading-indentation -Wno-format-truncation -Wno-misleading-indentation -Wno-format-truncation
-D WLED_RELEASE_NAME=esp32s2_4MB_M -D WLED_RELEASE_NAME=esp32s2_4MB_M
-DLOLIN_WIFI_FIX -DWLEDMM_WIFI_POWERON_HACK ;; seems to work much better with this
-DARDUINO_USB_CDC_ON_BOOT=0
-DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0
-D WLED_DISABLE_ADALIGHT ;; disables serial protocols, as the board only has CDC USB
-DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM
; -D WLEDMM_WIFI_POWERON_HACK -DLOLIN_WIFI_FIX ;; use this _only_ if your device is not able to make a WiFI connection! -DLOLIN_WIFI_FIX -DWLEDMM_WIFI_POWERON_HACK ;; seems to work much better with this
-DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1
-D WLED_DISABLE_ADALIGHT ;; disables serial protocols, as the board only has CDC USB
-D WLED_DISABLE_INFRARED ;; save flash space -D WLED_DISABLE_INFRARED ;; save flash space
-D WLED_DISABLE_ALEXA ;; save flash space -D WLED_DISABLE_ALEXA ;; save flash space
-D WLED_DISABLE_HUESYNC ;; save flash space -D WLED_DISABLE_HUESYNC ;; save flash space
-D WLED_DISABLE_LOXONE ;; save flash space -D WLED_DISABLE_LOXONE ;; save flash space
-D LEDPIN=16
-D BTNPIN=-1 -D RLYPIN=-1 -D IRPIN=-1
-D HW_PIN_SCL=40 -D HW_PIN_SDA=41
-D HW_PIN_MOSISPI=35 ;WLEDMM renamed from HW_PIN_DATASPI
-D HW_PIN_CLOCKSPI=36
-D HW_PIN_MISOSPI=37
-D AUDIOPIN=-1 -D AUDIOPIN=-1
-D SR_DMTYPE=1 -D I2S_SDPIN=9 -D I2S_WSPIN=8 -D I2S_CKPIN=17 -D MCLK_PIN=18 -D BTNPIN=-1 -D IRPIN=-1
-D LEDPIN=16 ;; second led pin = 18
-D HW_PIN_SCL=35 -D HW_PIN_SDA=33
-D RLYPIN=9
;; -D HW_PIN_MOSISPI=11 -D HW_PIN_CLOCKSPI=7 -D HW_PIN_MISOSPI=9 ;; 9 already in use for RELAY, 7 for IR
-D SR_DMTYPE=1 -D I2S_SDPIN=34 -D I2S_CKPIN=14 -D I2S_WSPIN=17 -D MCLK_PIN=-1 ;; reommended for mini shield
;; -D FFTTASK_PRIORITY=2 ;; useful for testing FFT timing. reduces audio latency, but makes effects slower.
;; -D STATUSLED=15
-D WLED_USE_MY_CONFIG -D WLED_USE_MY_CONFIG
lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M} lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M}
lib_ignore = lib_ignore =
IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
OneWire ; not needed as we don't include USERMOD_DALLASTEMPERATURE OneWire ; not needed as we don't include USERMOD_DALLASTEMPERATURE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
; RAM: [=== ] 30.9% (used 101228 bytes from 327680 bytes) ; RAM: [=== ] 29.7% (used 97376 bytes from 327680 bytes)
; Flash: [======== ] 80.4% (used 1527278 bytes from 1900544 bytes) ; Flash: [======== ] 81.4% (used 1547834 bytes from 1900544 bytes)
;; MM environment for generic ESP32-C3 -> 4MB flash, no PSRAM ;; MM environment for generic ESP32-C3 -> 4MB flash, no PSRAM

2
usermods/audioreactive/audio_reactive.h
View File

@@ -2030,7 +2030,7 @@ class AudioReactive : public Usermod {
xTaskCreateUniversal( xTaskCreateUniversal(
FFTcode, // Function to implement the task FFTcode, // Function to implement the task
"FFT", // Name of the task "FFT", // Name of the task
5000, // Stack size in words 3592, // Stack size in words // 3592 leaves 800-1024 bytes of task stack free
NULL, // Task input parameter NULL, // Task input parameter
FFTTASK_PRIORITY, // Priority of the task FFTTASK_PRIORITY, // Priority of the task
&FFT_Task // Task handle &FFT_Task // Task handle