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

Merge branch 'ar-energy' into auto-playlist

Browse Source
This commit is contained in:
Will Tatam
2024-03-05 23:35:54 +00:00
parent 43e5a12b1d 6550504f60
commit 6b194ef33d
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usermods/artifx/arti.h
View File

@@ -3,7 +3,7 @@
@file arti.h
@date 20220818
@author Ewoud Wijma
@Copyright (c) 2023 Ewoud Wijma
@Copyright (c) 2024 Ewoud Wijma
@repo https://github.com/ewoudwijma/ARTI
@remarks
- #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 100 //set this in ArduinoJson!!!, currently not necessary...

2
usermods/artifx/arti_wled.h
View File

@@ -3,7 +3,7 @@
@file arti_wled.h
@date 20220818
@author Ewoud Wijma
@Copyright (c) 2023 Ewoud Wijma
@Copyright (c) 2024 Ewoud Wijma
@repo https://github.com/ewoudwijma/ARTI
*/

2
usermods/artifx/usermod_v2_artifx.h
View File

@@ -3,7 +3,7 @@
@file usermod_v2_artifx.h
@date 20220818
@author Ewoud Wijma
@Copyright (c) 2023 Ewoud Wijma
@Copyright (c) 2024 Ewoud Wijma
@repo https://github.com/ewoudwijma/ARTI
*/

21
usermods/audioreactive/audio_reactive.h
View File

@@ -141,6 +141,10 @@ static uint8_t fftResult[NUM_GEQ_CHANNELS]= {0}; // Our calculated freq. chann
static float fftCalc[NUM_GEQ_CHANNELS] = {0.0f}; // Try and normalize fftBin values to a max of 4096, so that 4096/16 = 256. (also used by dynamics limiter)
static float fftAvg[NUM_GEQ_CHANNELS] = {0.0f}; // Calculated frequency channel results, with smoothing (used if dynamics limiter is ON)
int zcr = 0;
int energy = 0;
int lfc = 0;
// TODO: probably best not used by receive nodes
static float agcSensitivity = 128; // AGC sensitivity estimation, based on agc gain (multAgc). calculated by getSensitivity(). range 0..255
@@ -551,7 +555,18 @@ void FFTcode(void * parameter)
// pick our our current mic sample - we take the max value from all samples that go into FFT
if ((vReal[i] <= (INT16_MAX - 1024)) && (vReal[i] >= (INT16_MIN + 1024))) //skip extreme values - normally these are artefacts
if (fabsf((float)vReal[i]) > maxSample) maxSample = fabsf((float)vReal[i]);
// WLED-MM/TroyHacks: Calculate zero crossings
if (i < samplesFFT-2) {
if (vReal[i] * vReal[i+1] < 0) {
zcr++;
}
}
// WLED-MM/TroyHacks: Calculate energy
energy += vReal[i] * vReal[i];
}
energy /= 100000; // WLED-MM/TroyHacks: scale this down becasue we're gonna make it bigger later
// release highest sample to volume reactive effects early - not strictly necessary here - could also be done at the end of the function
// early release allows the filters (getSample() and agcAvg()) to work with fresh values - we will have matching gain and noise gate values when we want to process the FFT results.
micDataReal = maxSample;
@@ -646,6 +661,8 @@ void FFTcode(void * parameter)
vReal[i] = t / 16.0f; // Reduce magnitude. Want end result to be scaled linear and ~4096 max.
} // for()
lfc = fftAddAvg(1,9); // WLED-MM/TroyHacks: Calculate Low-Frequency Content
// mapping of FFT result bins to frequency channels
//if (fabsf(sampleAvg) > 0.25f) { // noise gate open
if (fabsf(volumeSmth) > 0.25f) { // noise gate open
@@ -1746,6 +1763,10 @@ class AudioReactive : public Usermod {
um_data->u_type[9] = UMT_FLOAT;
um_data->u_data[10] = &agcSensitivity; // used (New)
um_data->u_type[10] = UMT_FLOAT;
int extra[3] = {zcr, energy, lfc};
um_data->u_data[11] = extra; //
um_data->u_type[11] = UMT_INT16_ARR;
#else
// ESP8266
// See https://github.com/MoonModules/WLED/pull/60#issuecomment-1666972133 for explanation of these alternative sources of data

6
wled00/data/settings_sec.htm
View File

@@ -116,12 +116,12 @@
<h3>About</h3>
<!-- WLEDMM additions -->
<a href="https://github.com/MoonModules/WLED/" target="_blank">WLEDMM</a> version ##VERSION##<!-- Autoreplaced from package.json --> ☾<br>
(c) 2023 <a href="https://github.com/Aircoookie/WLED/compare/main...MoonModules:WLED:mdev" target="_blank">Github MoonModules WLED Commit Authors</a><br><br>
(c) 2024 <a href="https://github.com/Aircoookie/WLED/compare/main...MoonModules:WLED:mdev" target="_blank">Github MoonModules WLED Commit Authors</a><br><br>
fork of <a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED:</a><br>
<a href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits" target="_blank">Contributors, dependencies and special thanks</a><br>
A huge thank you to everyone who helped me create WLED!<br><br>
WLED core (c) 2016-2023 Christian Schwinne <br>
<i>Licensed under the <a href="https://github.com/Aircoookie/WLED/blob/master/LICENSE" target="_blank">MIT license</a></i><br><br>
WLED core (c) 2016-2024 Christian Schwinne <br>
<i>WLED MM Licensed under the <a href="https://github.com/MoonModules/WLED/blob/master/LICENSE" target="_blank">GPL v3 license</a></i><br><br>
Server message: <span class="sip"> Response error! </span><hr>
<div id="toast"></div>
<button type="button" onclick="B()">Back</button><button type="submit">Save</button>