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

make manual and dual auto-white mode work with palettes (upstream backport)

Browse Source 
extract white channel from first custom color, instead of setting it to black
This commit is contained in:
Frank
2026-01-09 23:50:30 +01:00
parent 7e104ba414
commit 0541a1f5b4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wled00/FX_fcn.cpp
View File

@@ -1636,15 +1636,16 @@ void __attribute__((hot)) Segment::blur(uint8_t blur_amount, bool smear) {
*/ */
uint32_t Segment::color_wheel(uint8_t pos) { uint32_t Segment::color_wheel(uint8_t pos) {
if (palette) return color_from_palette(pos, false, true, 0); if (palette) return color_from_palette(pos, false, true, 0);
uint8_t w = W(currentColor(0, colors[0])); // extract white channel
pos = 255 - pos; pos = 255 - pos;
if(pos < 85) { if (pos < 85) {
return ((uint32_t)(255 - pos * 3) << 16) | ((uint32_t)(0) << 8) | (pos * 3); return RGBW32((255 - pos * 3), 0, (pos * 3), w);
} else if(pos < 170) { } else if(pos < 170) {
pos -= 85; pos -= 85;
return ((uint32_t)(0) << 16) | ((uint32_t)(pos * 3) << 8) | (255 - pos * 3); return RGBW32(0, (pos * 3), (255 - pos * 3), w);
} else { } else {
pos -= 170; pos -= 170;
return ((uint32_t)(pos * 3) << 16) | ((uint32_t)(255 - pos * 3) << 8) | (0); return RGBW32((pos * 3), (255 - pos * 3), 0, w);
} }
} }
@@ -1674,10 +1675,9 @@ uint8_t Segment::get_random_wheel_index(uint8_t pos) const { // WLEDMM use fast
*/ */
uint32_t __attribute__((hot)) Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri) // WLEDMM use fast int types uint32_t __attribute__((hot)) Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri) // WLEDMM use fast int types
{ {
uint32_t color = gamma32(currentColor(mcol, colors[mcol]));
// default palette or no RGB support on segment // default palette or no RGB support on segment
if ((palette == 0 && mcol < NUM_COLORS) || !_isRGB) { if ((palette == 0 && mcol < NUM_COLORS) || !_isRGB) {
uint32_t color = currentColor(mcol, colors[mcol]);
color = gamma32(color);
if (pbri == 255) return color; if (pbri == 255) return color;
return RGBW32(scale8_video(R(color),pbri), scale8_video(G(color),pbri), scale8_video(B(color),pbri), scale8_video(W(color),pbri)); return RGBW32(scale8_video(R(color),pbri), scale8_video(G(color),pbri), scale8_video(B(color),pbri), scale8_video(W(color),pbri));
} }
@@ -1688,7 +1688,8 @@ uint32_t __attribute__((hot)) Segment::color_from_palette(uint_fast16_t i, bool
if (!wrap) paletteIndex = scale8(paletteIndex, 240); //cut off blend at palette "end" if (!wrap) paletteIndex = scale8(paletteIndex, 240); //cut off blend at palette "end"
CRGB fastled_col = ColorFromPalette(_currentPalette, paletteIndex, pbri, (strip.paletteBlend == 3)? NOBLEND:LINEARBLEND); // NOTE: paletteBlend should be global CRGB fastled_col = ColorFromPalette(_currentPalette, paletteIndex, pbri, (strip.paletteBlend == 3)? NOBLEND:LINEARBLEND); // NOTE: paletteBlend should be global
return RGBW32(fastled_col.r, fastled_col.g, fastled_col.b, 0); uint8_t w = W(color); // extract white channel
return RGBW32(fastled_col.r, fastled_col.g, fastled_col.b, w);
} }
//WLEDMM netmindz ar palette //WLEDMM netmindz ar palette