diff --git a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h index c15f116e..d08f295f 100644 --- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h +++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h @@ -85,7 +85,8 @@ class AutoPlaylistUsermod : public Usermod { // gets called once at boot. Do all initialization that doesn't depend on // network here void setup() { - USER_PRINTLN("AutoPlaylistUsermod"); + USER_PRINT(F("AutoPlaylistUsermod startup; enabled = ")); + USER_PRINT(enabled ? F("true"):F("false")); USER_PRINTLN(F(".")); initDone = true; } diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp index 0dad3ffc..f4e32bd4 100644 --- a/wled00/bus_manager.cpp +++ b/wled00/bus_manager.cpp @@ -729,12 +729,12 @@ uint32_t BusManager::memUsage(BusConfig &bc) { int BusManager::add(BusConfig &bc) { 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) { busses[numBusses] = new BusNetwork(bc); #ifdef WLED_ENABLE_HUB75MATRIX } 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); #endif } else if (IS_DIGITAL(bc.type)) { diff --git a/wled00/util.cpp b/wled00/util.cpp index ceefcc2f..8e6d349a 100644 --- a/wled00/util.cpp +++ b/wled00/util.cpp @@ -433,6 +433,7 @@ um_data_t* simulateSound(uint8_t simulationId) static float volumeSmth; static uint16_t volumeRaw; static float my_magnitude; + static uint16_t zeroCrossingCount = 0; // number of zero crossings in the current batch of 512 samples //arrays uint8_t *fftResult; @@ -447,7 +448,7 @@ um_data_t* simulateSound(uint8_t simulationId) // NOTE!!! // This may change as AudioReactive usermod may change 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; @@ -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[9] = &volumeSmth; // dummy (soundPressure) um_data->u_data[10] = &volumeSmth; // dummy (agcSensitivity) + um_data->u_data[11] = &zeroCrossingCount; } else { // get arrays from um_data fftResult = (uint8_t*)um_data->u_data[2]; @@ -527,6 +529,7 @@ um_data_t* simulateSound(uint8_t simulationId) volumeRaw = volumeSmth; 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 + zeroCrossingCount = floorf(FFT_MajorPeak / 36.0f); // 9Khz max frequency => 255 zero crossings return um_data; }