Merge branch 'json-mapping' into mdev

2022-09-06 17:44:25 +02:00
parent 526900fdc0 5b4c3dce1f
commit 1b724dbc0b
33 changed files with 18741 additions and 16083 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

@@ -269,9 +266,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