Merge remote-tracking branch 'origin/dev' into custom-effects

2022-09-20 11:02:59 +02:00
parent a20501a6a6 4d939cb778
commit 3455da98c4
41 changed files with 20512 additions and 17831 deletions
--- a/wled00/usermods_list.cpp
+++ b/wled00/usermods_list.cpp
@@ -133,9 +133,6 @@
 #endif

 #ifdef USERMOD_AUDIOREACTIVE
-  #ifdef WLED_DISABLE_AUDIO
-    #error Incompatible options: WLED_DISABLE_AUDIO and USERMOD_AUDIOREACTIVE
-  #endif
 #include "../usermods/audioreactive/audio_reactive.h"
 #endif

@@ -265,9 +262,6 @@ void registerUsermods()
  #endif
  
  #ifdef USERMOD_AUDIOREACTIVE
-    #ifdef WLED_DISABLE_AUDIO
-      #error Incompatible options: WLED_DISABLE_AUDIO and USERMOD_AUDIOREACTIVE
-    #endif
  usermods.add(new AudioReactive());
  #endif