Merge branch 'MoonModules:mdev' into Strip_Level_Color_Adjust
This commit is contained in:
Troy
@@ -7,6 +7,7 @@
|
||||
#include <driver/i2s.h>
|
||||
#include <driver/adc.h>
|
||||
|
||||
#include <math.h>
|
||||
#endif
|
||||
|
||||
#if defined(ARDUINO_ARCH_ESP32) && (defined(WLED_DEBUG) || defined(SR_DEBUG))
|
||||
@@ -141,6 +142,8 @@ 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)
|
||||
|
||||
static uint16_t zeroCrossingCount = 0; // number of zero crossings in the current batch of 512 samples
|
||||
|
||||
// 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
|
||||
|
||||
@@ -543,15 +546,27 @@ void FFTcode(void * parameter)
|
||||
}
|
||||
}
|
||||
|
||||
// find highest sample in the batch
|
||||
// set imaginary parts to 0
|
||||
memset(vImag, 0, sizeof(vImag));
|
||||
|
||||
// find highest sample in the batch, and count zero crossings
|
||||
float maxSample = 0.0f; // max sample from FFT batch
|
||||
uint_fast16_t newZeroCrossingCount = 0;
|
||||
for (int i=0; i < samplesFFT; i++) {
|
||||
// set imaginary parts to 0
|
||||
vImag[i] = 0;
|
||||
// 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-1)) {
|
||||
if (__builtin_signbit(vReal[i]) != __builtin_signbit(vReal[i+1])) // test sign bit: sign changed -> zero crossing
|
||||
newZeroCrossingCount++;
|
||||
}
|
||||
}
|
||||
newZeroCrossingCount = (newZeroCrossingCount*2)/3; // reduce value so it typicially stays below 256
|
||||
zeroCrossingCount = newZeroCrossingCount; // update only once, to avoid that effects pick up an intermediate value
|
||||
|
||||
// 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;
|
||||
@@ -770,8 +785,7 @@ void FFTcode(void * parameter)
|
||||
// run peak detection
|
||||
autoResetPeak();
|
||||
detectSamplePeak();
|
||||
|
||||
// we have new results - notify UDP sound send
|
||||
|
||||
haveNewFFTResult = true;
|
||||
|
||||
#if !defined(I2S_GRAB_ADC1_COMPLETELY)
|
||||
@@ -1007,7 +1021,7 @@ class AudioReactive : public Usermod {
|
||||
uint8_t samplePeak; // 01 Bytes offset 16 - 0 no peak; >=1 peak detected. In future, this will also provide peak Magnitude
|
||||
uint8_t frameCounter; // 01 Bytes offset 17 - track duplicate/out of order packets
|
||||
uint8_t fftResult[16]; // 16 Bytes offset 18
|
||||
uint8_t gap2[2]; // gap added by compiler: 02 Bytes, offset 34
|
||||
uint16_t zeroCrossingCount; // 02 Bytes, offset 34
|
||||
float FFT_Magnitude; // 04 Bytes offset 36
|
||||
float FFT_MajorPeak; // 04 Bytes offset 40
|
||||
};
|
||||
@@ -1547,6 +1561,7 @@ class AudioReactive : public Usermod {
|
||||
transmitData.samplePeak = udpSamplePeak ? 1:0;
|
||||
udpSamplePeak = false; // Reset udpSamplePeak after we've transmitted it
|
||||
transmitData.frameCounter = frameCounter;
|
||||
transmitData.zeroCrossingCount = zeroCrossingCount;
|
||||
|
||||
for (int i = 0; i < NUM_GEQ_CHANNELS; i++) {
|
||||
transmitData.fftResult[i] = (uint8_t)constrain(fftResult[i], 0, 254);
|
||||
@@ -1619,6 +1634,7 @@ class AudioReactive : public Usermod {
|
||||
FFT_MajorPeak = constrain(receivedPacket->FFT_MajorPeak, 1.0f, 11025.0f); // restrict value to range expected by effects
|
||||
soundPressure = volumeSmth; // substitute - V2 format does not (yet) include this value
|
||||
agcSensitivity = 128.0f; // substitute - V2 format does not (yet) include this value
|
||||
zeroCrossingCount = receivedPacket->zeroCrossingCount;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -1720,7 +1736,7 @@ class AudioReactive : public Usermod {
|
||||
// usermod exchangeable data
|
||||
// we will assign all usermod exportable data here as pointers to original variables or arrays and allocate memory for pointers
|
||||
um_data = new um_data_t;
|
||||
um_data->u_size = 11;
|
||||
um_data->u_size = 12;
|
||||
um_data->u_type = new um_types_t[um_data->u_size];
|
||||
um_data->u_data = new void*[um_data->u_size];
|
||||
um_data->u_data[0] = &volumeSmth; //*used (New)
|
||||
@@ -1746,6 +1762,8 @@ 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;
|
||||
um_data->u_data[11] = &zeroCrossingCount;
|
||||
um_data->u_type[11] = UMT_UINT16;
|
||||
#else
|
||||
// ESP8266
|
||||
// See https://github.com/MoonModules/WLED/pull/60#issuecomment-1666972133 for explanation of these alternative sources of data
|
||||
@@ -1760,6 +1778,8 @@ class AudioReactive : public Usermod {
|
||||
um_data->u_type[9] = UMT_FLOAT;
|
||||
um_data->u_data[10] = &agcSensitivity; // used (New) - dummy value (128 => 50%)
|
||||
um_data->u_type[10] = UMT_FLOAT;
|
||||
um_data->u_data[11] = &zeroCrossingCount;
|
||||
um_data->u_type[11] = UMT_UINT16;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1921,7 +1941,7 @@ class AudioReactive : public Usermod {
|
||||
USER_PRINTF("| uint8_t samplePeak offset = %2d size = %2d\n", offsetof(audioSyncPacket, samplePeak), sizeof(data.samplePeak)); // offset 16 size 1
|
||||
USER_PRINTF("| uint8_t frameCounter offset = %2d size = %2d\n", offsetof(audioSyncPacket, frameCounter), sizeof(data.frameCounter)); // offset 17 size 1
|
||||
USER_PRINTF("| uint8_t fftResult[16] offset = %2d size = %2d\n", offsetof(audioSyncPacket, fftResult[0]), sizeof(data.fftResult)); // offset 18 size 16
|
||||
USER_PRINTF("| uint8_t gap2[2] offset = %2d size = %2d\n", offsetof(audioSyncPacket, gap2[0]), sizeof(data.gap2)); // offset 34 size 2
|
||||
USER_PRINTF("| uint16_t zeroCrossingCount offset = %2d size = %2d\n", offsetof(audioSyncPacket, zeroCrossingCount), sizeof(data.zeroCrossingCount)); // offset 34 size 2
|
||||
USER_PRINTF("| float FFT_Magnitude offset = %2d size = %2d\n", offsetof(audioSyncPacket, FFT_Magnitude), sizeof(data.FFT_Magnitude));// offset 36 size 4
|
||||
USER_PRINTF("| float FFT_MajorPeak offset = %2d size = %2d\n", offsetof(audioSyncPacket, FFT_MajorPeak), sizeof(data.FFT_MajorPeak));// offset 40 size 4
|
||||
USER_PRINTLN(); USER_FLUSH();
|
||||
|
||||
@@ -667,7 +667,13 @@ class WM8978Source : public I2SSource {
|
||||
_wm8978I2cWrite( 1,0b000111110); // Power Management 1 - power off most things, but enable mic bias and I/O tie-off to help mitigate mic leakage.
|
||||
_wm8978I2cWrite( 2,0b110111111); // Power Management 2 - enable output and amp stages (amps may lift signal but it works better on the ADCs)
|
||||
_wm8978I2cWrite( 3,0b000001100); // Power Management 3 - enable L&R output mixers
|
||||
|
||||
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
|
||||
_wm8978I2cWrite( 4,0b001010000); // Audio Interface - standard I2S, 24-bit
|
||||
#else
|
||||
_wm8978I2cWrite( 4,0b001001000); // Audio Interface - left-justified I2S, 24-bit
|
||||
#endif
|
||||
|
||||
_wm8978I2cWrite( 6,0b000000000); // Clock generation control - use external mclk
|
||||
_wm8978I2cWrite( 7,0b000000100); // Sets sample rate to ~24kHz (only used for internal calculations, not I2S)
|
||||
_wm8978I2cWrite(14,0b010001000); // 128x ADC oversampling - high pass filter disabled as it kills the bass response
|
||||
|
||||
510
usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
Normal file
510
usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
Normal file
@@ -0,0 +1,510 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef WLED_DEBUG
|
||||
#ifndef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
#define USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "wled.h"
|
||||
|
||||
class AutoPlaylistUsermod : public Usermod {
|
||||
|
||||
private:
|
||||
|
||||
// experimental parameters by softhack007 - more balanced but need testing
|
||||
const uint_fast32_t MAX_DISTANCE_TRACKER = 184; // maximum accepted distance_tracker
|
||||
const uint_fast32_t ENERGY_SCALE = 1500;
|
||||
const float FILTER_SLOW1 = 0.0075f; // for "slow" energy - was 0.01f
|
||||
const float FILTER_SLOW2 = 0.005f; // for "slow" lfc / zcr - was 0.01f
|
||||
const float FILTER_FAST1 = 0.2f; // for "fast" energy - was 0.10f
|
||||
const float FILTER_FAST2 = 0.25f; // for "fast" lfc / zcr - was 0.10f
|
||||
const float FILTER_VOLUME = 0.03f; // for volumeSmth averaging - takes 8-10sec until "silence"
|
||||
|
||||
bool initDone = false;
|
||||
bool functionality_enabled = false;
|
||||
bool silenceDetected = true;
|
||||
byte ambientPlaylist = 1;
|
||||
byte musicPlaylist = 2;
|
||||
int timeout = 60;
|
||||
bool autoChange = false;
|
||||
byte lastAutoPlaylist = 0;
|
||||
unsigned long lastSoundTime = millis()-(timeout*1000)-100;
|
||||
unsigned long change_timer = millis();
|
||||
unsigned long autochange_timer = millis();
|
||||
float avg_volumeSmth = 0;
|
||||
|
||||
// fftesult de-scaling factors: 2.8f / fftResultPink[]
|
||||
const float fftDeScaler[NUM_GEQ_CHANNELS] = {2.8/2.35, 2.8/1.32, 2.8/1.32, 2.8/1.40, 2.8/1.48, 2.8/1.57, 2.8/1.68, 2.8/1.80, 2.8/1.89, 2.8/1.95, 2.8/2.14, 2.8/2.26, 2.8/2.50, 2.8/2.90, 2.8/4.20, 2.8/6.50};
|
||||
|
||||
uint_fast32_t energy = 0;
|
||||
|
||||
float avg_long_energy = 250;
|
||||
float avg_long_lfc = 1000;
|
||||
float avg_long_zcr = 500;
|
||||
|
||||
float avg_short_energy = 250;
|
||||
float avg_short_lfc = 1000;
|
||||
float avg_short_zcr = 500;
|
||||
|
||||
bool resetFilters = true; // to (re)initialize filters on first run
|
||||
uint_fast32_t vector_energy = 0;
|
||||
uint_fast32_t vector_lfc = 0;
|
||||
uint_fast32_t vector_zcr = 0;
|
||||
|
||||
uint_fast32_t distance = 0;
|
||||
uint_fast32_t distance_tracker = UINT_FAST32_MAX;
|
||||
|
||||
unsigned long lastchange = millis();
|
||||
|
||||
int_fast16_t change_threshold = 50; // arbitrary starting point.
|
||||
uint_fast16_t change_threshold_change = 0;
|
||||
|
||||
int change_lockout = 1000; // never change below this number of millis. Ideally 60000/your_average_bpm*beats_to_skip = change_lockout (1000 = skip 2 beats at 120bpm)
|
||||
int ideal_change_min = 10000; // ideally change patterns no less than this number of millis
|
||||
int ideal_change_max = 20000; // ideally change patterns no more than this number of millis
|
||||
|
||||
std::vector<int> autoChangeIds;
|
||||
|
||||
static const char _name[];
|
||||
static const char _autoPlaylistEnabled[];
|
||||
static const char _ambientPlaylist[];
|
||||
static const char _musicPlaylist[];
|
||||
static const char _timeout[];
|
||||
static const char _autoChange[];
|
||||
static const char _change_lockout[];
|
||||
static const char _ideal_change_min[];
|
||||
static const char _ideal_change_max[];
|
||||
|
||||
public:
|
||||
|
||||
AutoPlaylistUsermod(bool enabled):Usermod("AutoPlaylist", enabled) {
|
||||
// noop
|
||||
}
|
||||
|
||||
// gets called once at boot. Do all initialization that doesn't depend on
|
||||
// network here
|
||||
void setup() {
|
||||
USER_PRINTLN("AutoPlaylistUsermod");
|
||||
initDone = true;
|
||||
}
|
||||
|
||||
// gets called every time WiFi is (re-)connected. Initialize own network
|
||||
// interfaces here
|
||||
void connected() {
|
||||
// noop
|
||||
}
|
||||
|
||||
void change(um_data_t *um_data) {
|
||||
|
||||
uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
|
||||
|
||||
energy = 0;
|
||||
|
||||
for (int i=0; i < NUM_GEQ_CHANNELS; i++) {
|
||||
|
||||
// make an attempt to undo some "trying to look better" FFT manglings in AudioReactive postProcessFFTResults()
|
||||
|
||||
float amplitude = float(fftResult[i]) * fftDeScaler[i]; // undo "pink noise" scaling
|
||||
amplitude /= 0.85f + (float(i)/4.5f); // undo extra up-scaling for high frequencies
|
||||
energy += roundf(amplitude * amplitude); // calc energy from amplitude
|
||||
|
||||
}
|
||||
|
||||
energy /= ENERGY_SCALE; // scale down so we get 0 sometimes
|
||||
|
||||
uint16_t lfc = float(fftResult[0]) * fftDeScaler[0] / 0.85f; // might as well undo pink noise here too.
|
||||
uint16_t zcr = *(uint16_t*)um_data->u_data[11];
|
||||
|
||||
// WLED-MM/TroyHacks: Calculate the long- and short-running averages
|
||||
// and the individual vector distances.
|
||||
|
||||
if (volumeSmth > 1.0f) {
|
||||
|
||||
// initialize filters on first run
|
||||
if (resetFilters) {
|
||||
avg_short_energy = avg_long_energy = energy;
|
||||
avg_short_lfc = avg_long_lfc = lfc;
|
||||
avg_short_zcr = avg_long_zcr = zcr;
|
||||
resetFilters = false;
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTLN("AutoPlaylist: Filters reset.");
|
||||
#endif
|
||||
}
|
||||
|
||||
avg_long_energy = avg_long_energy + FILTER_SLOW1 * (float(energy) - avg_long_energy);
|
||||
avg_long_lfc = avg_long_lfc + FILTER_SLOW2 * (float(lfc) - avg_long_lfc);
|
||||
avg_long_zcr = avg_long_zcr + FILTER_SLOW2 * (float(zcr) - avg_long_zcr);
|
||||
|
||||
avg_short_energy = avg_short_energy + FILTER_FAST1 * (float(energy) - avg_short_energy);
|
||||
avg_short_lfc = avg_short_lfc + FILTER_FAST2 * (float(lfc) - avg_short_lfc);
|
||||
avg_short_zcr = avg_short_zcr + FILTER_FAST2 * (float(zcr) - avg_short_zcr);
|
||||
|
||||
// allegedly this is faster than pow(whatever,2)
|
||||
vector_lfc = (avg_short_lfc-avg_long_lfc)*(avg_short_lfc-avg_long_lfc);
|
||||
vector_energy = (avg_short_energy-avg_long_energy)*(avg_short_energy-avg_long_energy);
|
||||
vector_zcr = (avg_short_zcr-avg_long_zcr)*(avg_short_zcr-avg_long_zcr);
|
||||
|
||||
}
|
||||
|
||||
distance = vector_lfc + vector_energy + vector_zcr;
|
||||
|
||||
long change_interval = millis()-lastchange;
|
||||
|
||||
if (distance < distance_tracker && change_interval > change_lockout && volumeSmth > 1.0f) {
|
||||
distance_tracker = distance;
|
||||
}
|
||||
|
||||
// Debug for adjusting formulas, etc:
|
||||
// USER_PRINTF("Distance: %5lu - v_lfc: %5lu v_energy: %5lu v_zcr: %5lu\n",(unsigned long)distance,(unsigned long)vector_lfc,(unsigned long)vector_energy,(unsigned long)vector_zcr);
|
||||
|
||||
if ((millis() - change_timer) > ideal_change_min) { // softhack007 same result as "millis() > change_timer + ideal_change_min", but more robust against unsigned overflow
|
||||
|
||||
// Make the analysis less sensitive if we miss the window.
|
||||
// Sometimes the analysis lowers the change_threshold too much for
|
||||
// the current music, especially after track changes or during
|
||||
// sparse intros and breakdowns.
|
||||
|
||||
if (change_interval > ideal_change_min && distance_tracker <= MAX_DISTANCE_TRACKER) {
|
||||
|
||||
if (distance_tracker >= change_threshold) {
|
||||
change_threshold_change = distance_tracker-change_threshold;
|
||||
} else {
|
||||
change_threshold_change = change_threshold-distance_tracker;
|
||||
}
|
||||
|
||||
change_threshold = distance_tracker;
|
||||
|
||||
if (change_threshold_change > 9999) change_threshold_change = 0; // cosmetic for debug
|
||||
|
||||
if (functionality_enabled) {
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("--- lowest distance = %4lu - no changes done in %6ldms - next change_threshold is %4u (%4u diff approx)\n", (unsigned long)distance_tracker,change_interval,change_threshold,change_threshold_change);
|
||||
#endif
|
||||
}
|
||||
|
||||
distance_tracker = UINT_FAST32_MAX;
|
||||
|
||||
}
|
||||
|
||||
change_timer = millis();
|
||||
|
||||
}
|
||||
|
||||
if (distance <= change_threshold && change_interval > change_lockout && volumeSmth > 1.0f) {
|
||||
|
||||
change_threshold_change = max(1.0f, roundf(change_threshold-(distance*0.9f))); // exclude negatives, ensure change_threshold_change is always >= 1
|
||||
|
||||
if (change_interval > ideal_change_max) {
|
||||
change_threshold += change_threshold_change; // make changes more sensitive
|
||||
} else if (change_interval < ideal_change_min) {
|
||||
change_threshold -= change_threshold_change; // make changes less sensitive
|
||||
} else {
|
||||
change_threshold_change = 0; // change was within our window, no sensitivity change
|
||||
}
|
||||
|
||||
if (change_threshold < 1) change_threshold = 0; // we need change_threshold to be signed because otherwise this wraps to UINT_FAST16_MAX
|
||||
|
||||
distance_tracker = UINT_FAST32_MAX;
|
||||
|
||||
if (functionality_enabled) {
|
||||
|
||||
if (autoChangeIds.size() == 0) {
|
||||
if(currentPlaylist < 1) return;
|
||||
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("Loading presets from playlist: %3d\n", currentPlaylist);
|
||||
#endif
|
||||
|
||||
JsonObject playtlistOjb = doc.to<JsonObject>();
|
||||
serializePlaylist(playtlistOjb);
|
||||
JsonArray playlistArray = playtlistOjb["playlist"]["ps"];
|
||||
|
||||
for(JsonVariant v : playlistArray) {
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("Adding %3u to autoChangeIds\n", v.as<int>());
|
||||
#endif
|
||||
autoChangeIds.push_back(v.as<int>());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
uint8_t newpreset = 0;
|
||||
|
||||
do {
|
||||
newpreset = autoChangeIds.at(random(0, autoChangeIds.size())); // random() is *exclusive* of the last value, so it's OK to use the full size.
|
||||
} while ((currentPreset == newpreset) && (autoChangeIds.size() > 1)); // make sure we get a different random preset. Unless there is only one.
|
||||
|
||||
if (change_interval > change_lockout+3) {
|
||||
|
||||
// Make sure we have a statistically significant change and we aren't
|
||||
// just bouncing off change_lockout. That's valid for changing the
|
||||
// thresholds, but might be a bit crazy for lighting changes.
|
||||
// When the music changes quite a bit, the distance calculation can
|
||||
// go into freefall - this logic stops that from triggering right
|
||||
// after change_lockout. Better for smaller change_lockout values.
|
||||
|
||||
suspendPlaylist(); // suspend the playlist engine before changing to another preset
|
||||
applyPreset(newpreset);
|
||||
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("*** CHANGE distance = %4lu - change_interval was %5ldms - next change_threshold is %4u (%4u diff aprox)\n",(unsigned long)distance,change_interval,change_threshold,change_threshold_change);
|
||||
#endif
|
||||
|
||||
} else {
|
||||
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("^^^ SKIP!! distance = %4lu - change_interval was %5ldms - next change_threshold is %4u (%4u diff aprox)\n",(unsigned long)distance,change_interval,change_threshold,change_threshold_change);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
lastchange = millis();
|
||||
change_timer = millis();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Da loop.
|
||||
*/
|
||||
void loop() {
|
||||
|
||||
if (!enabled) return;
|
||||
|
||||
if (millis() < 10000) return; // Wait for device to settle
|
||||
|
||||
if (lastAutoPlaylist > 0 && currentPlaylist != lastAutoPlaylist && currentPreset != 0) {
|
||||
if (functionality_enabled) {
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("AutoPlaylist: disable due to manual change of playlist from %u to %d, preset:%u\n", lastAutoPlaylist, currentPlaylist, currentPreset);
|
||||
#endif
|
||||
functionality_enabled = false;
|
||||
} else if (currentPlaylist == musicPlaylist) {
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("AutoPlaylist: enabled due to manual change of playlist back to %u\n", currentPlaylist);
|
||||
#endif
|
||||
functionality_enabled = true;
|
||||
lastAutoPlaylist = currentPlaylist;
|
||||
}
|
||||
}
|
||||
|
||||
if (!functionality_enabled && currentPlaylist == musicPlaylist) {
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("AutoPlaylist: enabled due selecting musicPlaylist(%u)\n", musicPlaylist);
|
||||
#endif
|
||||
functionality_enabled = true;
|
||||
}
|
||||
|
||||
if (bri == 0) return;
|
||||
|
||||
um_data_t *um_data;
|
||||
|
||||
if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
|
||||
// No Audio Reactive
|
||||
silenceDetected = true;
|
||||
return;
|
||||
}
|
||||
|
||||
float volumeSmth = *(float*)um_data->u_data[0];
|
||||
|
||||
avg_volumeSmth = avg_volumeSmth + FILTER_VOLUME * (volumeSmth - avg_volumeSmth);
|
||||
|
||||
if (avg_volumeSmth >= 1.0f) {
|
||||
lastSoundTime = millis();
|
||||
}
|
||||
|
||||
if (millis() - lastSoundTime > (long(timeout) * 1000)) {
|
||||
if (!silenceDetected) {
|
||||
silenceDetected = true;
|
||||
USER_PRINTLN("AutoPlaylist: Silence detected");
|
||||
changePlaylist(ambientPlaylist);
|
||||
}
|
||||
} else {
|
||||
if (silenceDetected) {
|
||||
silenceDetected = false;
|
||||
USER_PRINTLN("AutoPlaylist: Sound detected");
|
||||
changePlaylist(musicPlaylist);
|
||||
}
|
||||
if (autoChange && millis() >= autochange_timer+22) {
|
||||
change(um_data);
|
||||
autochange_timer = millis();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
|
||||
* Values in the state object may be modified by connected clients
|
||||
*/
|
||||
void addToJsonInfo(JsonObject& root) {
|
||||
JsonObject user = root["u"];
|
||||
if (user.isNull()) {
|
||||
user = root.createNestedObject("u");
|
||||
}
|
||||
|
||||
if (!enabled) return; // usermod disabled -> don't add to info page
|
||||
|
||||
String uiNameString = FPSTR(_name);
|
||||
if (enabled && functionality_enabled) {
|
||||
uiNameString += F(" Running");
|
||||
} else if (!enabled) {
|
||||
uiNameString += F(" Disabled");
|
||||
} else {
|
||||
uiNameString += F(" Suspended");
|
||||
}
|
||||
JsonArray infoArr = user.createNestedArray(uiNameString); // name + status
|
||||
|
||||
String uiDomString = (currentPlaylist > 0) ? String("#") + String(currentPlaylist) + String(" ") : String("");
|
||||
|
||||
if (currentPlaylist == musicPlaylist && currentPlaylist > 0) {
|
||||
uiDomString += F("Music Playlist");
|
||||
} else if (currentPlaylist == ambientPlaylist && currentPlaylist > 0) {
|
||||
uiDomString += F("Ambient Playlist");
|
||||
} else {
|
||||
uiDomString += F("Playlist Overridden");
|
||||
}
|
||||
|
||||
uiDomString += F("<br />");
|
||||
|
||||
if (enabled && autoChange && currentPlaylist == musicPlaylist && functionality_enabled) {
|
||||
uiDomString += F("AutoChange is Active");
|
||||
} else if (autoChange && (currentPlaylist != musicPlaylist || !functionality_enabled || !enabled)) {
|
||||
uiDomString += F("AutoChange on Stand-by");
|
||||
} else if (!autoChange) {
|
||||
uiDomString += F("AutoChange is Disabled");
|
||||
}
|
||||
|
||||
// #ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
// uiDomString += F("<br />");
|
||||
// uiDomString += F("Change Threshold: ");
|
||||
// uiDomString += String(change_threshold);
|
||||
// #endif
|
||||
|
||||
infoArr.add(uiDomString);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
|
||||
* Values in the state object may be modified by connected clients
|
||||
*/
|
||||
void readFromJsonState(JsonObject& root) {
|
||||
return;
|
||||
}
|
||||
|
||||
void appendConfigData() {
|
||||
oappend(SET_F("addHB('AutoPlaylist');"));
|
||||
}
|
||||
|
||||
/*
|
||||
* addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
|
||||
* It will be called by WLED when settings are actually saved (for example, LED settings are saved)
|
||||
* If you want to force saving the current state, use serializeConfig() in your loop().
|
||||
*
|
||||
* CAUTION: serializeConfig() will initiate a filesystem write operation.
|
||||
* It might cause the LEDs to stutter and will cause flash wear if called too often.
|
||||
* Use it sparingly and always in the loop, never in network callbacks!
|
||||
*
|
||||
* addToConfig() will also not yet add your setting to one of the settings pages automatically.
|
||||
* To make that work you still have to add the setting to the HTML, xml.cpp and set.cpp manually.
|
||||
*
|
||||
* I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
|
||||
*/
|
||||
void addToConfig(JsonObject& root) {
|
||||
|
||||
JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
|
||||
|
||||
top[FPSTR(_autoPlaylistEnabled)] = enabled;
|
||||
top[FPSTR(_timeout)] = timeout;
|
||||
top[FPSTR(_ambientPlaylist)] = ambientPlaylist; // usermodparam
|
||||
top[FPSTR(_musicPlaylist)] = musicPlaylist; // usermodparam
|
||||
top[FPSTR(_autoChange)] = autoChange;
|
||||
top[FPSTR(_change_lockout)] = change_lockout;
|
||||
top[FPSTR(_ideal_change_min)] = ideal_change_min;
|
||||
top[FPSTR(_ideal_change_max)] = ideal_change_max;
|
||||
|
||||
lastAutoPlaylist = 0;
|
||||
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTLN(F("AutoPlaylist config saved."));
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* readFromConfig() can be used to read back the custom settings you added with addToConfig().
|
||||
* This is called by WLED when settings are loaded (currently this only happens once immediately after boot)
|
||||
*
|
||||
* readFromConfig() is called BEFORE setup(). This means you can use your persistent values in setup() (e.g. pin assignments, buffer sizes),
|
||||
* but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
|
||||
* If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
|
||||
*
|
||||
* The function should return true if configuration was successfully loaded or false if there was no configuration.
|
||||
*/
|
||||
bool readFromConfig(JsonObject& root) {
|
||||
|
||||
JsonObject top = root[FPSTR(_name)];
|
||||
|
||||
if (top.isNull()) {
|
||||
USER_PRINT(FPSTR(_name));
|
||||
USER_PRINTLN(F(": No config found. (Using defaults.)"));
|
||||
return false;
|
||||
}
|
||||
|
||||
enabled = top[FPSTR(_autoPlaylistEnabled)] | enabled;
|
||||
timeout = top[FPSTR(_timeout)] | timeout;
|
||||
ambientPlaylist = top[FPSTR(_ambientPlaylist)] | ambientPlaylist;
|
||||
musicPlaylist = top[FPSTR(_musicPlaylist)] | musicPlaylist;
|
||||
autoChange = top[FPSTR(_autoChange)] | autoChange;
|
||||
change_lockout = top[FPSTR(_change_lockout)] | change_lockout;
|
||||
ideal_change_min = top[FPSTR(_ideal_change_min)] | ideal_change_min;
|
||||
ideal_change_max = top[FPSTR(_ideal_change_max)] | ideal_change_max;
|
||||
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINT(FPSTR(_name));
|
||||
USER_PRINTLN(F(" config (re)loaded."));
|
||||
#endif
|
||||
|
||||
// use "return !top["newestParameter"].isNull();" when updating Usermod with new features
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
|
||||
* This could be used in the future for the system to determine whether your usermod is installed.
|
||||
*/
|
||||
uint16_t getId() {
|
||||
return USERMOD_ID_AUTOPLAYLIST;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void changePlaylist(byte id) {
|
||||
String name = "";
|
||||
getPresetName(id, name);
|
||||
#ifdef USERMOD_AUTO_PLAYLIST_DEBUG
|
||||
USER_PRINTF("AutoPlaylist: Applying \"%s\"\n", name.c_str());
|
||||
#endif
|
||||
// if (currentPlaylist != id) { // un-comment to only change on "real" changes
|
||||
unloadPlaylist(); // applying a preset requires to unload previous playlist
|
||||
applyPreset(id, CALL_MODE_NOTIFICATION);
|
||||
// }
|
||||
lastAutoPlaylist = id;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
const char AutoPlaylistUsermod::_name[] PROGMEM = "AutoPlaylist";
|
||||
const char AutoPlaylistUsermod::_autoPlaylistEnabled[] PROGMEM = "enabled";
|
||||
const char AutoPlaylistUsermod::_ambientPlaylist[] PROGMEM = "ambientPlaylist";
|
||||
const char AutoPlaylistUsermod::_musicPlaylist[] PROGMEM = "musicPlaylist";
|
||||
const char AutoPlaylistUsermod::_timeout[] PROGMEM = "timeout";
|
||||
const char AutoPlaylistUsermod::_autoChange[] PROGMEM = "autoChange";
|
||||
const char AutoPlaylistUsermod::_change_lockout[] PROGMEM = "change_lockout";
|
||||
const char AutoPlaylistUsermod::_ideal_change_min[] PROGMEM = "ideal_change_min";
|
||||
const char AutoPlaylistUsermod::_ideal_change_max[] PROGMEM = "ideal_change_max";
|
||||
Reference in New Issue
Block a user