Merge remote-tracking branch 'upstream/main' into perlin_noise

usermods/audioreactive/audio_reactive.cpp

@@ -1,4 +1,3 @@
-#pragma once
 
 #include "wled.h"
 
@@ -2064,3 +2063,6 @@ const char AudioReactive::_digitalmic[] PROGMEM = "digitalmic";
 const char AudioReactive::_addPalettes[]       PROGMEM = "add-palettes";
 const char AudioReactive::UDP_SYNC_HEADER[]    PROGMEM = "00002"; // new sync header version, as format no longer compatible with previous structure
 const char AudioReactive::UDP_SYNC_HEADER_v1[] PROGMEM = "00001"; // old sync header version - need to add backwards-compatibility feature
+
+static AudioReactive ar_module;
+REGISTER_USERMOD(ar_module);

usermods/audioreactive/library.json

@@ -0,0 +1,15 @@
+{
+  "name": "audioreactive",
+  "build": {
+    "libArchive": false,
+    "extraScript": "override_sqrt.py"
+  },
+  "dependencies": [
+    {
+      "owner": "kosme",      
+      "name": "arduinoFFT",
+      "version": "2.0.1",
+      "platforms": "espressif32"
+    }
+  ]
+}

usermods/audioreactive/override_sqrt.py

@@ -0,0 +1,5 @@
+Import('env')
+
+for lb in env.GetLibBuilders():
+    if lb.name == "arduinoFFT":
+        lb.env.Append(CPPDEFINES=[("sqrt_internal", "sqrtf")])

usermods/audioreactive/readme.md

@@ -27,11 +27,7 @@ Currently ESP8266 is not supported, due to low speed and small RAM of this chip.
 There are however plans to create a lightweight audioreactive for the 8266, with reduced features.
 ## Installation 
 
-### using latest _arduinoFFT_ library version 2.x
-The latest arduinoFFT release version should be used for audioreactive.
-
-* `build_flags` = `-D USERMOD_AUDIOREACTIVE -D sqrt_internal=sqrtf`
-* `lib_deps`= `kosme/arduinoFFT @ 2.0.1`
+Add 'ADS1115_v2' to `custom_usermods` in your platformio environment.
 
 ## Configuration