Skip to content

Commit 2755666

Browse files
netmindznetmindz
committed
Merge remote-tracking branch 'mm/mdev' into gifplayer-html-MM
2 parents 1fe531f + af3476c commit 2755666

File tree

8 files changed

+5493
-271
lines changed

8 files changed

+5493
-271
lines changed

‎platformio.ini‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLE
10731073
AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2 ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
10741074

10751075
animartrix_build_flags = -D USERMOD_ANIMARTRIX ;; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
1076-
animartrix_lib_deps = https://github.com/netmindz/animartrix.git#657f754783268b648e1d56b3cd31c810379d0c89 ;; Dirty state fix
1076+
animartrix_lib_deps = https://github.com/netmindz/animartrix.git#bd556cef92a6fee9777c0a7304c9de1a84cba184 ;; init state fix
10771077
animartrix_lib_ignore = animartrix ;; to remove the animartrix lib dependancy (saves a few bytes)
10781078

10791079
DMXin_build_flags = -D WLED_ENABLE_DMX_INPUT ;; WLEDMM DMX physical input - requires ESP-IDF v4.4.x
@@ -1652,6 +1652,29 @@ lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compila
16521652
; RAM: [=== ] 25.5% (used 83400 bytes from 327680 bytes)
16531653
; Flash: [==========] 97.3% (used 1530013 bytes from 1572864 bytes)
16541654

1655+
[env:esp32_4MB_V4_S_eth]
1656+
extends = esp32_4MB_V4_S_base
1657+
build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
1658+
-D WLED_RELEASE_NAME=esp32_4MB_V4_S
1659+
-D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
1660+
-D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
1661+
-D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
1662+
-D WLEDMM_SAVE_FLASH
1663+
-D WLED_DISABLE_LOXONE
1664+
-D WLED_DISABLE_ALEXA
1665+
-D WLED_DISABLE_HUESYNC
1666+
-D WLED_DISABLE_MQTT
1667+
-D WLED_DISABLE_INFRARED
1668+
; -D WLED_DEBUG
1669+
; -D SR_DEBUG
1670+
; -D MIC_LOGGER
1671+
${common_mm.HUB75_build_flags}
1672+
-D WLED_USE_ETHERNET
1673+
-D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
1674+
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
1675+
${common_mm.HUB75_lib_deps}
1676+
lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
1677+
16551678
;; softhack007: my favourite HUB75 buildenv - fastest possible
16561679
[env:esp32_4MB_V4_HUB75_forum]
16571680
extends = esp32_4MB_V4_S_base

‎usermods/usermod_v2_animartrix/usermod_v2_animartrix.h‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -388,58 +388,58 @@ class AnimartrixUsermod : public Usermod {
388388

389389
if(!enabled) return;
390390

391-
strip.addEffect(255, &mode_Module_Experiment10, _data_FX_mode_Module_Experiment10);
392-
strip.addEffect(255, &mode_Module_Experiment9, _data_FX_mode_Module_Experiment9);
393-
strip.addEffect(255, &mode_Module_Experiment8, _data_FX_mode_Module_Experiment8);
394-
strip.addEffect(255, &mode_Module_Experiment7, _data_FX_mode_Module_Experiment7);
395-
strip.addEffect(255, &mode_Module_Experiment6, _data_FX_mode_Module_Experiment6);
396-
strip.addEffect(255, &mode_Module_Experiment5, _data_FX_mode_Module_Experiment5);
397-
strip.addEffect(255, &mode_Module_Experiment4, _data_FX_mode_Module_Experiment4);
398-
strip.addEffect(255, &mode_Zoom2, _data_FX_mode_Zoom2);
399-
strip.addEffect(255, &mode_Module_Experiment3, _data_FX_mode_Module_Experiment3);
400-
strip.addEffect(255, &mode_Module_Experiment2, _data_FX_mode_Module_Experiment2);
401-
strip.addEffect(255, &mode_Module_Experiment1, _data_FX_mode_Module_Experiment1);
402-
strip.addEffect(255, &mode_Parametric_Water, _data_FX_mode_Parametric_Water);
403-
strip.addEffect(255, &mode_Water, _data_FX_mode_Water);
404-
strip.addEffect(255, &mode_Complex_Kaleido_6, _data_FX_mode_Complex_Kaleido_6);
405-
strip.addEffect(255, &mode_Complex_Kaleido_5, _data_FX_mode_Complex_Kaleido_5);
406-
strip.addEffect(255, &mode_Complex_Kaleido_4, _data_FX_mode_Complex_Kaleido_4);
407-
strip.addEffect(255, &mode_Complex_Kaleido_3, _data_FX_mode_Complex_Kaleido_3);
408-
strip.addEffect(255, &mode_Complex_Kaleido_2, _data_FX_mode_Complex_Kaleido_2);
409-
strip.addEffect(255, &mode_Complex_Kaleido, _data_FX_mode_Complex_Kaleido);
410-
strip.addEffect(255, &mode_SM10, _data_FX_mode_SM10);
411-
strip.addEffect(255, &mode_SM9, _data_FX_mode_SM9);
412-
strip.addEffect(255, &mode_SM8, _data_FX_mode_SM8);
413-
// strip.addEffect(255, &mode_SM7, _data_FX_mode_SM7);
414-
strip.addEffect(255, &mode_SM6, _data_FX_mode_SM6);
415-
strip.addEffect(255, &mode_SM5, _data_FX_mode_SM5);
416-
strip.addEffect(255, &mode_SM4, _data_FX_mode_SM4);
417-
strip.addEffect(255, &mode_SM3, _data_FX_mode_SM3);
418-
strip.addEffect(255, &mode_SM2, _data_FX_mode_SM2);
419-
strip.addEffect(255, &mode_SM1, _data_FX_mode_SM1);
420-
strip.addEffect(255, &mode_Big_Caleido, _data_FX_mode_Big_Caleido);
421-
strip.addEffect(255, &mode_RGB_Blobs5, _data_FX_mode_RGB_Blobs5);
422-
strip.addEffect(255, &mode_RGB_Blobs4, _data_FX_mode_RGB_Blobs4);
423-
strip.addEffect(255, &mode_RGB_Blobs3, _data_FX_mode_RGB_Blobs3);
424-
strip.addEffect(255, &mode_RGB_Blobs2, _data_FX_mode_RGB_Blobs2);
425-
strip.addEffect(255, &mode_RGB_Blobs, _data_FX_mode_RGB_Blobs);
426-
strip.addEffect(255, &mode_Polar_Waves, _data_FX_mode_Polar_Waves);
427-
strip.addEffect(255, &mode_Slow_Fade, _data_FX_mode_Slow_Fade);
428-
strip.addEffect(255, &mode_Zoom, _data_FX_mode_Zoom);
429-
strip.addEffect(255, &mode_Hot_Blob, _data_FX_mode_Hot_Blob);
430-
strip.addEffect(255, &mode_Spiralus2, _data_FX_mode_Spiralus2);
431-
strip.addEffect(255, &mode_Spiralus, _data_FX_mode_Spiralus);
432-
strip.addEffect(255, &mode_Yves, _data_FX_mode_Yves);
433-
strip.addEffect(255, &mode_Scaledemo1, _data_FX_mode_Scaledemo1);
434-
strip.addEffect(255, &mode_Lava1, _data_FX_mode_Lava1);
435-
strip.addEffect(255, &mode_Caleido3, _data_FX_mode_Caleido3);
436-
strip.addEffect(255, &mode_Caleido2, _data_FX_mode_Caleido2);
437-
strip.addEffect(255, &mode_Caleido1, _data_FX_mode_Caleido1);
438-
strip.addEffect(255, &mode_Distance_Experiment, _data_FX_mode_Distance_Experiment);
439-
strip.addEffect(255, &mode_Center_Field, _data_FX_mode_Center_Field);
440-
strip.addEffect(255, &mode_Waves, _data_FX_mode_Waves);
441-
strip.addEffect(255, &mode_Chasing_Spirals, _data_FX_mode_Chasing_Spirals);
442-
strip.addEffect(255, &mode_Rotating_Blob, _data_FX_mode_Rotating_Blob);
391+
strip.addEffect(203, &mode_Module_Experiment10, _data_FX_mode_Module_Experiment10);
392+
strip.addEffect(204, &mode_Module_Experiment9, _data_FX_mode_Module_Experiment9);
393+
strip.addEffect(205, &mode_Module_Experiment8, _data_FX_mode_Module_Experiment8);
394+
strip.addEffect(206, &mode_Module_Experiment7, _data_FX_mode_Module_Experiment7);
395+
strip.addEffect(207, &mode_Module_Experiment6, _data_FX_mode_Module_Experiment6);
396+
strip.addEffect(208, &mode_Module_Experiment5, _data_FX_mode_Module_Experiment5);
397+
strip.addEffect(209, &mode_Module_Experiment4, _data_FX_mode_Module_Experiment4);
398+
strip.addEffect(210, &mode_Zoom2, _data_FX_mode_Zoom2);
399+
strip.addEffect(211, &mode_Module_Experiment3, _data_FX_mode_Module_Experiment3);
400+
strip.addEffect(212, &mode_Module_Experiment2, _data_FX_mode_Module_Experiment2);
401+
strip.addEffect(213, &mode_Module_Experiment1, _data_FX_mode_Module_Experiment1);
402+
strip.addEffect(214, &mode_Parametric_Water, _data_FX_mode_Parametric_Water);
403+
strip.addEffect(215, &mode_Water, _data_FX_mode_Water);
404+
strip.addEffect(216, &mode_Complex_Kaleido_6, _data_FX_mode_Complex_Kaleido_6);
405+
strip.addEffect(217, &mode_Complex_Kaleido_5, _data_FX_mode_Complex_Kaleido_5);
406+
strip.addEffect(218, &mode_Complex_Kaleido_4, _data_FX_mode_Complex_Kaleido_4);
407+
strip.addEffect(219, &mode_Complex_Kaleido_3, _data_FX_mode_Complex_Kaleido_3);
408+
strip.addEffect(220, &mode_Complex_Kaleido_2, _data_FX_mode_Complex_Kaleido_2);
409+
strip.addEffect(221, &mode_Complex_Kaleido, _data_FX_mode_Complex_Kaleido);
410+
strip.addEffect(222, &mode_SM10, _data_FX_mode_SM10);
411+
strip.addEffect(223, &mode_SM9, _data_FX_mode_SM9);
412+
strip.addEffect(224, &mode_SM8, _data_FX_mode_SM8);
413+
// strip.addEffect(225, &mode_SM7, _data_FX_mode_SM7);
414+
strip.addEffect(226, &mode_SM6, _data_FX_mode_SM6);
415+
strip.addEffect(227, &mode_SM5, _data_FX_mode_SM5);
416+
strip.addEffect(228, &mode_SM4, _data_FX_mode_SM4);
417+
strip.addEffect(229, &mode_SM3, _data_FX_mode_SM3);
418+
strip.addEffect(230, &mode_SM2, _data_FX_mode_SM2);
419+
strip.addEffect(231, &mode_SM1, _data_FX_mode_SM1);
420+
strip.addEffect(232, &mode_Big_Caleido, _data_FX_mode_Big_Caleido);
421+
strip.addEffect(233, &mode_RGB_Blobs5, _data_FX_mode_RGB_Blobs5);
422+
strip.addEffect(234, &mode_RGB_Blobs4, _data_FX_mode_RGB_Blobs4);
423+
strip.addEffect(235, &mode_RGB_Blobs3, _data_FX_mode_RGB_Blobs3);
424+
strip.addEffect(236, &mode_RGB_Blobs2, _data_FX_mode_RGB_Blobs2);
425+
strip.addEffect(237, &mode_RGB_Blobs, _data_FX_mode_RGB_Blobs);
426+
strip.addEffect(238, &mode_Polar_Waves, _data_FX_mode_Polar_Waves);
427+
strip.addEffect(239, &mode_Slow_Fade, _data_FX_mode_Slow_Fade);
428+
strip.addEffect(240, &mode_Zoom, _data_FX_mode_Zoom);
429+
strip.addEffect(241, &mode_Hot_Blob, _data_FX_mode_Hot_Blob);
430+
strip.addEffect(242, &mode_Spiralus2, _data_FX_mode_Spiralus2);
431+
strip.addEffect(243, &mode_Spiralus, _data_FX_mode_Spiralus);
432+
strip.addEffect(244, &mode_Yves, _data_FX_mode_Yves);
433+
strip.addEffect(245, &mode_Scaledemo1, _data_FX_mode_Scaledemo1);
434+
strip.addEffect(246, &mode_Lava1, _data_FX_mode_Lava1);
435+
strip.addEffect(247, &mode_Caleido3, _data_FX_mode_Caleido3);
436+
strip.addEffect(248, &mode_Caleido2, _data_FX_mode_Caleido2);
437+
strip.addEffect(249, &mode_Caleido1, _data_FX_mode_Caleido1);
438+
strip.addEffect(250, &mode_Distance_Experiment, _data_FX_mode_Distance_Experiment);
439+
strip.addEffect(251, &mode_Center_Field, _data_FX_mode_Center_Field);
440+
strip.addEffect(252, &mode_Waves, _data_FX_mode_Waves);
441+
strip.addEffect(253, &mode_Chasing_Spirals, _data_FX_mode_Chasing_Spirals);
442+
strip.addEffect(254, &mode_Rotating_Blob, _data_FX_mode_Rotating_Blob);
443443

444444
initDone = true;
445445
}

0 commit comments

Comments
 (0)