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

Audio palette always start with black - fixes use of palette with Fire effect

Browse Source
This commit is contained in:
Will Tatam
2023-01-20 19:04:55 +00:00
parent 2d9b3fd284
commit 78bc566b06
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wled00/FX_fcn.cpp
View File

@@ -1233,27 +1233,31 @@ uint8_t * Segment::getAudioPalette(int pal) {
} }
uint8_t *fftResult = (uint8_t*)um_data->u_data[2]; uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
static uint8_t xyz[12]; // Needs to be 4 times however many colors are being used. static uint8_t xyz[16]; // Needs to be 4 times however many colors are being used.
// 3 colors = 12, 4 colors = 16, etc. // 3 colors = 12, 4 colors = 16, etc.
CRGB rgb = getCRGBForBand(0, fftResult, pal);
xyz[0] = 0; // anchor of first color - must be zero xyz[0] = 0; // anchor of first color - must be zero
xyz[1] = rgb.r; xyz[1] = 0;
xyz[2] = rgb.g; xyz[2] = 0;
xyz[3] = rgb.b; xyz[3] = 0;
rgb = getCRGBForBand(4, fftResult, pal); CRGB rgb = getCRGBForBand(1, fftResult, pal);
xyz[4] = 128; xyz[4] = 1; // anchor of first color
xyz[5] = rgb.r; xyz[5] = rgb.r;
xyz[6] = rgb.g; xyz[6] = rgb.g;
xyz[7] = rgb.b; xyz[7] = rgb.b;
rgb = getCRGBForBand(8, fftResult, pal); rgb = getCRGBForBand(4, fftResult, pal);
xyz[8] = 255; // anchor of last color - must be 255 xyz[8] = 128;
xyz[9] = rgb.r; xyz[9] = rgb.r;
xyz[10] = rgb.g; xyz[10] = rgb.g;
xyz[11] = rgb.b; xyz[11] = rgb.b;
rgb = getCRGBForBand(8, fftResult, pal);
xyz[12] = 255; // anchor of last color - must be 255
xyz[13] = rgb.r;
xyz[14] = rgb.g;
xyz[15] = rgb.b;
return xyz; return xyz;
} }

2
wled00/util.cpp
View File

@@ -520,7 +520,7 @@ CRGB getCRGBForBand(int x, uint8_t *fftResult, int pal) {
CRGB value; CRGB value;
CHSV hsv; CHSV hsv;
if(pal == 71) { // bit hacky to use palette id here, but don't want to litter the code with lots of different methods. TODO: add enum for palette creation type if(pal == 71) { // bit hacky to use palette id here, but don't want to litter the code with lots of different methods. TODO: add enum for palette creation type
if(x == 0) { if(x == 1) {
value = CRGB(fftResult[10]/2, fftResult[4]/2, fftResult[0]/2); value = CRGB(fftResult[10]/2, fftResult[4]/2, fftResult[0]/2);
} }
else if(x == 255) { else if(x == 255) {