Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quick experiment to expand frequency range #167

Draft
wants to merge 6 commits into
base: mdev
Choose a base branch
from
Draft

Quick experiment to expand frequency range #167

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76afab2
Quick experiment to expand frequency range
netmindz Sep 21, 2024
dd4cf26
Quick experiment to expand frequency range
netmindz Sep 21, 2024
7dcd9ca
Merge branch 'MoonModules:mdev' into small-fft
netmindz Sep 21, 2024
f98c13b
Merge branch 'small-fft' of github.com:netmindz/WLED into small-fft
netmindz Sep 22, 2024
08b1181
Merge branch 'MoonModules:mdev' into small-fft
netmindz Sep 27, 2024
58d79fa
smallFFT updates and DJLight settings
netmindz Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 43 additions & 7 deletions wled00/FX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,38 @@ static um_data_t* getAudioData() {
}
return um_data;
}


static uint8_t getMax(uint8_t* myArray, int arraySize) {
uint8_t maxV = 0;
for (int i = 0; i < arraySize; i++) {
maxV = max(myArray[i], maxV);
}
return maxV;
}

static uint8_t decayValue(uint8_t last, uint8_t newValue) {
if(last == 0 || SEGMENT.check2 == false) {
return newValue;
}
return max((uint8_t) (last * 0.8), newValue);
}

static uint8_t* getSmallFFT(uint8_t* fftresult) {
static uint8_t data[3] = {0};

uint8_t group1[3] = {fftresult[0], fftresult[1]/2, fftresult[2]/2};
data[0] = decayValue(data[0], getMax(group1, 3));

uint8_t group2[3] = {fftresult[4]/2, fftresult[5], fftresult[6]/6};
data[1] = decayValue(data[1], getMax(group2, 3));

uint8_t group3[3] = {fftresult[13]/2, fftresult[14], fftresult[15]/2};
data[2] = decayValue(data[2], getMax(group3, 5));

// USER_PRINTF("%u %u %u\n", data[0], data[1], data[2]);
return data;
}
// effect functions

/*
Expand Down Expand Up @@ -7306,6 +7338,7 @@ uint16_t mode_DJLight(void) { // Written by Stefan Petrick, Ad

um_data_t *um_data = getAudioData();
uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
uint8_t *fftSmall = getSmallFFT(fftResult);
float volumeSmth = *(float*)um_data->u_data[0];

if (SEGENV.call == 0) {
Expand All @@ -7319,8 +7352,11 @@ uint16_t mode_DJLight(void) { // Written by Stefan Petrick, Ad

CRGB color = CRGB(0,0,0);
// color = CRGB(fftResult[15]/2, fftResult[5]/2, fftResult[0]/2); // formula from 0.13.x (10Khz): R = 3880-5120, G=240-340, B=60-100
if (!SEGENV.check1) {
color = CRGB(fftResult[12]/2, fftResult[3]/2, fftResult[1]/2); // formula for 0.14.x (22Khz): R = 3015-3704, G=216-301, B=86-129
if (SEGENV.check1) {
color = CRGB(fftSmall[2]/2, fftSmall[1]/2, fftSmall[0]/3);
}
else if(true) {
color = CRGB(fftResult[15], fftResult[5]/2, fftResult[0]/2); // formula from 0.13.x (10Khz): R = 3880-5120, G=240-340, B=60-100
} else {
// candy factory: an attempt to get more colors
color = CRGB(fftResult[11]/2 + fftResult[12]/4 + fftResult[14]/4, // red : 2412-3704 + 4479-7106
Expand All @@ -7340,11 +7376,11 @@ uint16_t mode_DJLight(void) { // Written by Stefan Petrick, Ad
if (color.getLuma() > 32) { // don't change "dark" pixels
CHSV hsvColor = rgb2hsv_approximate(color);
hsvColor.v = min(max(hsvColor.v, (uint8_t)48), (uint8_t)204); // 48 < brightness < 204
if (SEGENV.check1)
hsvColor.s = max(hsvColor.s, (uint8_t)204); // candy factory mode: strongly turn up color saturation (> 192)
else
// if (SEGENV.check1)
// hsvColor.s = max(hsvColor.s, (uint8_t)204); // candy factory mode: strongly turn up color saturation (> 192)
// else
hsvColor.s = max(hsvColor.s, (uint8_t)108); // normal mode: turn up color saturation to avoid pastels
color = hsvColor;
// color = hsvColor;
}
//if (color.getLuma() > 12) color.maximizeBrightness(); // for testing

Expand All @@ -7360,7 +7396,7 @@ uint16_t mode_DJLight(void) { // Written by Stefan Petrick, Ad

return FRAMETIME;
} // mode_DJLight()
static const char _data_FX_MODE_DJLIGHT[] PROGMEM = "DJ Light@Speed,,,,,Candy Factory;;;01f;m12=2,si=0"; // Arc, Beatsin
static const char _data_FX_MODE_DJLIGHT[] PROGMEM = "DJ Light@Speed,,,,,Small FFT,Decay;;;01f;m12=2,si=0"; // Arc, Beatsin


////////////////////
Expand Down