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

minor cleanup

Browse Source 
* startup message from UM autoplaylist
* zeroCrossingCount added to sound simulation
* debug messages cleanup
This commit is contained in:
Frank
2024-04-30 12:47:45 +02:00
parent 4bfdf9a590
commit 714d4850af
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
View File

@@ -85,7 +85,8 @@ class AutoPlaylistUsermod : public Usermod {
// gets called once at boot. Do all initialization that doesn't depend on // gets called once at boot. Do all initialization that doesn't depend on
// network here // network here
void setup() { void setup() {
USER_PRINTLN("AutoPlaylistUsermod"); USER_PRINT(F("AutoPlaylistUsermod startup; enabled = "));
USER_PRINT(enabled ? F("true"):F("false")); USER_PRINTLN(F("."));
initDone = true; initDone = true;
} }

4
wled00/bus_manager.cpp
View File

@@ -729,12 +729,12 @@ uint32_t BusManager::memUsage(BusConfig &bc) {
int BusManager::add(BusConfig &bc) { int BusManager::add(BusConfig &bc) {
if (getNumBusses() - getNumVirtualBusses() >= WLED_MAX_BUSSES) return -1; if (getNumBusses() - getNumVirtualBusses() >= WLED_MAX_BUSSES) return -1;
USER_PRINTF("BusManager::add(bc.type=%u)\n", bc.type); DEBUG_PRINTF("BusManager::add(bc.type=%u)\n", bc.type);
if (bc.type >= TYPE_NET_DDP_RGB && bc.type < 96) { if (bc.type >= TYPE_NET_DDP_RGB && bc.type < 96) {
busses[numBusses] = new BusNetwork(bc); busses[numBusses] = new BusNetwork(bc);
#ifdef WLED_ENABLE_HUB75MATRIX #ifdef WLED_ENABLE_HUB75MATRIX
} else if (bc.type >= TYPE_HUB75MATRIX && bc.type <= (TYPE_HUB75MATRIX + 10)) { } else if (bc.type >= TYPE_HUB75MATRIX && bc.type <= (TYPE_HUB75MATRIX + 10)) {
USER_PRINTLN("BusManager::add - Adding BusHub75Matrix"); DEBUG_PRINTLN("BusManager::add - Adding BusHub75Matrix");
busses[numBusses] = new BusHub75Matrix(bc); busses[numBusses] = new BusHub75Matrix(bc);
#endif #endif
} else if (IS_DIGITAL(bc.type)) { } else if (IS_DIGITAL(bc.type)) {

5
wled00/util.cpp
View File

@@ -433,6 +433,7 @@ um_data_t* simulateSound(uint8_t simulationId)
static float volumeSmth; static float volumeSmth;
static uint16_t volumeRaw; static uint16_t volumeRaw;
static float my_magnitude; static float my_magnitude;
static uint16_t zeroCrossingCount = 0; // number of zero crossings in the current batch of 512 samples
//arrays //arrays
uint8_t *fftResult; uint8_t *fftResult;
@@ -447,7 +448,7 @@ um_data_t* simulateSound(uint8_t simulationId)
// NOTE!!! // NOTE!!!
// This may change as AudioReactive usermod may change // This may change as AudioReactive usermod may change
um_data = new um_data_t; 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_type = new um_types_t[um_data->u_size];
um_data->u_data = new void*[um_data->u_size]; um_data->u_data = new void*[um_data->u_size];
um_data->u_data[0] = &volumeSmth; um_data->u_data[0] = &volumeSmth;
@@ -461,6 +462,7 @@ um_data_t* simulateSound(uint8_t simulationId)
um_data->u_data[8] = &FFT_MajorPeak; // dummy (FFT Peak smoothed) um_data->u_data[8] = &FFT_MajorPeak; // dummy (FFT Peak smoothed)
um_data->u_data[9] = &volumeSmth; // dummy (soundPressure) um_data->u_data[9] = &volumeSmth; // dummy (soundPressure)
um_data->u_data[10] = &volumeSmth; // dummy (agcSensitivity) um_data->u_data[10] = &volumeSmth; // dummy (agcSensitivity)
um_data->u_data[11] = &zeroCrossingCount;
} else { } else {
// get arrays from um_data // get arrays from um_data
fftResult = (uint8_t*)um_data->u_data[2]; fftResult = (uint8_t*)um_data->u_data[2];
@@ -527,6 +529,7 @@ um_data_t* simulateSound(uint8_t simulationId)
volumeRaw = volumeSmth; volumeRaw = volumeSmth;
my_magnitude = 10000.0f / 8.0f; //no idea if 10000 is a good value for FFT_Magnitude ??? my_magnitude = 10000.0f / 8.0f; //no idea if 10000 is a good value for FFT_Magnitude ???
if (volumeSmth < 1 ) my_magnitude = 0.001f; // noise gate closed - mute if (volumeSmth < 1 ) my_magnitude = 0.001f; // noise gate closed - mute
zeroCrossingCount = floorf(FFT_MajorPeak / 36.0f); // 9Khz max frequency => 255 zero crossings
return um_data; return um_data;
} }