Skip to content

Replace uint8_t color arrays with CRGBW (DO NOT MERGE, its broken still) #5700

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

Draft
DedeHai wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Replace uint8_t color arrays with CRGBW (DO NOT MERGE, its broken still) #5700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6083e2
some initial changes
DedeHai Jun 22, 2026
881f05d
convert uint8_t arrays into CRGBW
DedeHai Jun 23, 2026
7ae9f76
bugfix in init
DedeHai Jun 23, 2026
62a4acd
some fixes
DedeHai Jun 23, 2026
73d3626
bugfixes
DedeHai Jun 24, 2026
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
16 changes: 4 additions & 12 deletions usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ class RotaryEncoderBrightnessColor : public Usermod
}
else
{
fastled_col.red = colPri[0];
fastled_col.green = colPri[1];
fastled_col.blue = colPri[2];
fastled_col = colPri;
prim_hsv = rgb2hsv(fastled_col);
new_val = (int16_t)prim_hsv.h + fadeAmount;
if (new_val > 255)
Expand All @@ -104,9 +102,7 @@ class RotaryEncoderBrightnessColor : public Usermod
new_val += 255; // roll-over if smaller than 0
prim_hsv.h = (byte)new_val;
fastled_col = prim_hsv ;
colPri[0] = fastled_col.red;
colPri[1] = fastled_col.green;
colPri[2] = fastled_col.blue;
colPri = fastled_col;
}
}
else if (Enc_B == LOW)
Expand All @@ -118,9 +114,7 @@ class RotaryEncoderBrightnessColor : public Usermod
}
else
{
fastled_col.red = colPri[0];
fastled_col.green = colPri[1];
fastled_col.blue = colPri[2];
fastled_col = colPri;
prim_hsv = rgb2hsv(fastled_col);
new_val = (int16_t)prim_hsv.h - fadeAmount;
if (new_val > 255)
Expand All @@ -129,9 +123,7 @@ class RotaryEncoderBrightnessColor : public Usermod
new_val += 255; // roll-over if smaller than 0
prim_hsv.h = (byte)new_val;
fastled_col = prim_hsv;
colPri[0] = fastled_col.red;
colPri[1] = fastled_col.green;
colPri[2] = fastled_col.blue;
colPri = fastled_col;
}
}
//call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (No notification)
Expand Down
10 changes: 5 additions & 5 deletions usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ void RotaryEncoderUIUsermod::setup()

loopTime = millis();

currentCCT = (approximateKelvinFromRGB(RGBW32(colPri[0], colPri[1], colPri[2], colPri[3])) - 1900) >> 5;
currentCCT = (approximateKelvinFromRGB(colPri.color32) - 1900) >> 5;

if (!initDone) sortModesAndPalettes();

Expand Down Expand Up @@ -928,11 +928,11 @@ void RotaryEncoderUIUsermod::changeHue(bool increase){
for (unsigned i=0; i<strip.getSegmentsNum(); i++) {
Segment& seg = strip.getSegment(i);
if (!seg.isActive()) continue;
seg.colors[0] = RGBW32(colPri[0], colPri[1], colPri[2], colPri[3]);
seg.colors[0] = colPri;
}
} else {
Segment& seg = strip.getSegment(strip.getMainSegmentId());
seg.colors[0] = RGBW32(colPri[0], colPri[1], colPri[2], colPri[3]);
seg.colors[0] = colPri;
}
lampUdated();
#ifdef USERMOD_FOUR_LINE_DISPLAY
Expand All @@ -957,11 +957,11 @@ void RotaryEncoderUIUsermod::changeSat(bool increase){
for (unsigned i=0; i<strip.getSegmentsNum(); i++) {
Segment& seg = strip.getSegment(i);
if (!seg.isActive()) continue;
seg.colors[0] = RGBW32(colPri[0], colPri[1], colPri[2], colPri[3]);
seg.colors[0] = colPri;
}
} else {
Segment& seg = strip.getSegment(strip.getMainSegmentId());
seg.colors[0] = RGBW32(colPri[0], colPri[1], colPri[2], colPri[3]);
seg.colors[0] = colPri;
}
lampUdated();
#ifdef USERMOD_FOUR_LINE_DISPLAY
Expand Down
18 changes: 9 additions & 9 deletions wled00/alexa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void onAlexaChange(EspalexaDevice* dev)
{
if (dev->getColorMode() == EspalexaColorMode::ct) //shade of white
{
byte rgbw[4];
CRGBW rgbw = 0;
uint16_t ct = dev->getCt();
if (!ct) return;
uint16_t k = 1000000 / ct; //mireds to kelvin
Expand All @@ -109,24 +109,24 @@ void onAlexaChange(EspalexaDevice* dev)

strip.setCCT(k);
if (hasManualWhite) {
rgbw[0] = 0; rgbw[1] = 0; rgbw[2] = 0; rgbw[3] = 255;
rgbw.color32 = 0xFF000000; // color channels off
} else {
rgbw[0] = 255; rgbw[1] = 255; rgbw[2] = 255; rgbw[3] = 0;
rgbw.color32 = 0x00FFFFFF; // white channel off
dev->setValue(255);
}
} else if (strip.hasWhiteChannel()) {
switch (ct) { //these values empirically look good on RGBW
case 199: rgbw[0]=255; rgbw[1]=255; rgbw[2]=255; rgbw[3]=255; break;
case 234: rgbw[0]=127; rgbw[1]=127; rgbw[2]=127; rgbw[3]=255; break;
case 284: rgbw[0]= 0; rgbw[1]= 0; rgbw[2]= 0; rgbw[3]=255; break;
case 350: rgbw[0]=130; rgbw[1]= 90; rgbw[2]= 0; rgbw[3]=255; break;
case 383: rgbw[0]=255; rgbw[1]=153; rgbw[2]= 0; rgbw[3]=255; break;
case 199: rgbw.color32 = 0xFFFFFFFF; break; // w=255 r=255 g=255 b=255
case 234: rgbw.color32 = 0xFF7F7F7F; break; // w=255 r=127 g=127 b=127
case 284: rgbw.color32 = 0xFF000000; break; // w=255 r=0 g=0 b=0
case 350: rgbw.color32 = 0xFF825A00; break; // w=255 r=130 g=90 b=0
case 383: rgbw.color32 = 0xFFFF9900; break; // w=255 r=255 g=153 b=0
default : colorKtoRGB(k, rgbw);
}
} else {
colorKtoRGB(k, rgbw);
}
strip.getMainSegment().setColor(0, RGBW32(rgbw[0], rgbw[1], rgbw[2], rgbw[3]));
strip.getMainSegment().setColor(0, rgbw.color32);
} else {
uint32_t color = dev->getRGB();
strip.getMainSegment().setColor(0, color);
Expand Down
95 changes: 45 additions & 50 deletions wled00/colors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

/*
* color blend function
* the calculation for each color is: result = (C1*(256-blend)+C2+C2*blend) / 256
* the calculation for each color is: result = (C1*(256-blend)+C2*blend) / 256

@coderabbitai coderabbitai Bot Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Correct the documented blend formula.

The optimized code adds one extra C2 term so blend == 255 reaches color2; the comment should say C2*(blend+1), not C2*blend. As per path instructions, comments should be verified against code behavior.

📝 Proposed comment fix 
- * the calculation for each color is: result = (C1*(256-blend)+C2*blend) / 256
+ * the calculation for each color is: result = (C1*(256-blend)+C2*(blend+1)) / 256
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
* the calculation for each color is: result = (C1*(256-blend)+C2*blend) / 256
* the calculation for each color is: result = (C1*(256-blend)+C2*(blend+1)) / 256
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@wled00/colors.cpp` at line 18, The blend formula documented in the comment at
the top of wled00/colors.cpp does not match the actual optimized implementation.
Update the comment that states "the calculation for each color is: result =
(C1*(256-blend)+C2*blend) / 256" to correctly reflect the code behavior by
changing C2*blend to C2*(blend+1), which ensures that when blend equals 255, the
result is color2.

Source: Path instructions

*/
uint32_t WLED_O2_ATTR IRAM_ATTR color_blend(uint32_t color1, uint32_t color2, uint8_t blend) {
// min / max blend checking is omitted: calls with 0 or 255 are rare, checking lowers overall performance
Expand Down Expand Up @@ -144,7 +144,7 @@ uint32_t ColorFromPalette(const CRGBPalette16& pal, unsigned index, uint8_t brig
return RGBW32(red1,green1,blue1,0);
}

void setRandomColor(byte* rgb)
void setRandomColor(CRGBW &rgb)
{
lastRandomIndex = get_random_wheel_index(lastRandomIndex);
colorHStoRGB(lastRandomIndex*256,255,rgb);
Expand Down Expand Up @@ -283,10 +283,10 @@ void loadCustomPalettes() {
size_t palSize = MIN(pal.size(), 36);
palSize -= palSize % 2; // make sure size is multiple of 2
for (size_t i=0, j=0; i<palSize && pal[i].as<int>()<256; i+=2) {
uint8_t rgbw[] = {0,0,0,0};
CRGBW rgbw = 0;
if (colorFromHexString(rgbw, pal[i+1].as<const char *>())) { // will catch non-string entires
tcp[ j ] = (uint8_t) pal[ i ].as<int>(); // index
for (size_t c=0; c<3; c++) tcp[j+1+c] = rgbw[c]; // only use RGB component
for (size_t c=0; c<3; c++) tcp[j+1+c] = rgbw.raw[2-c]; // only use RGB component (raw is B,G,R,W i.e. [0] = blue
DEBUGFX_PRINTF_P(PSTR("%2u -> %3d [%3d,%3d,%3d]\n"), i, int(tcp[j]), int(tcp[j+1]), int(tcp[j+2]), int(tcp[j+3]));
j += 4;
}
Expand Down Expand Up @@ -321,7 +321,7 @@ size_t removeUsermodPalettes(const char *name) {
return before - usermodPalettes.size();
}

// convert HSV (16bit hue) to RGB (32bit with white = 0), optimized for speed
// convert HSV (16bit hue) to RGB (32bit, white stays unmodified), optimized for speed
WLED_O2_ATTR void hsv2rgb_spectrum(const CHSV32& hsv, CRGBW& rgb) {
unsigned p, q, t;
unsigned region = ((unsigned)hsv.h * 6) >> 16; // h / (65536 / 6)
Expand Down Expand Up @@ -412,17 +412,15 @@ CHSV rgb2hsv(const CRGB c) { // CRGB to CHSV
return CHSV(hsv);
}

void colorHStoRGB(uint16_t hue, byte sat, byte* rgb) { //hue, sat to rgb
CRGBW crgb;
hsv2rgb_spectrum(CHSV32(hue, sat, 255), crgb);
rgb[0] = crgb.r;
rgb[1] = crgb.g;
rgb[2] = crgb.b;
void colorHStoRGB(uint16_t hue, byte sat, CRGBW &rgb) { //hue, sat to rgb
rgb = 0; // init to black, white is unused so make sure it does not contain garbage
hsv2rgb_spectrum(CHSV32(hue, sat, 255), rgb);
}

//get RGB values from color temperature in K (https://tannerhelland.com/2012/09/18/convert-temperature-rgb-algorithm-code.html)
void colorKtoRGB(uint16_t kelvin, byte* rgb) //white spectrum to rgb, calc
void colorKtoRGB(uint16_t kelvin, CRGBW &rgb) //white spectrum to rgb, calc
{
rgb = 0; // init to black, white is unused so make sure it does not contain garbage
int r = 0, g = 0, b = 0;
float temp = kelvin / 100.0f;
if (temp <= 66.0f) {
Expand All @@ -439,36 +437,36 @@ void colorKtoRGB(uint16_t kelvin, byte* rgb) //white spectrum to rgb, calc
b = 255;
}
//g += 12; //mod by Aircoookie, a bit less accurate but visibly less pinkish
rgb[0] = (uint8_t) constrain(r, 0, 255);
rgb[1] = (uint8_t) constrain(g, 0, 255);
rgb[2] = (uint8_t) constrain(b, 0, 255);
rgb[3] = 0;
rgb.r = (uint8_t) constrain(r, 0, 255);
rgb.g = (uint8_t) constrain(g, 0, 255);
rgb.b = (uint8_t) constrain(b, 0, 255);
}

void colorCTtoRGB(uint16_t mired, byte* rgb) //white spectrum to rgb, bins
void colorCTtoRGB(uint16_t mired, CRGBW &rgb) //white spectrum to rgb, bins
{
rgb = 0; // init to black, white is unused so make sure it does not contain garbage
//this is only an approximation using WS2812B with gamma correction enabled
if (mired > 475) {
rgb[0]=255;rgb[1]=199;rgb[2]=92;//500
rgb.r=255;rgb.g=199;rgb.b=92;//500
} else if (mired > 425) {
rgb[0]=255;rgb[1]=213;rgb[2]=118;//450
rgb.r=255;rgb.g=213;rgb.b=118;//450
} else if (mired > 375) {
rgb[0]=255;rgb[1]=216;rgb[2]=118;//400
rgb.r=255;rgb.g=216;rgb.b=118;//400
} else if (mired > 325) {
rgb[0]=255;rgb[1]=234;rgb[2]=140;//350
rgb.r=255;rgb.g=234;rgb.b=140;//350
} else if (mired > 275) {
rgb[0]=255;rgb[1]=243;rgb[2]=160;//300
rgb.r=255;rgb.g=243;rgb.b=160;//300
} else if (mired > 225) {
rgb[0]=250;rgb[1]=255;rgb[2]=188;//250
rgb.r=250;rgb.g=255;rgb.b=188;//250
} else if (mired > 175) {
rgb[0]=247;rgb[1]=255;rgb[2]=215;//200
rgb.r=247;rgb.g=255;rgb.b=215;//200
} else {
rgb[0]=237;rgb[1]=255;rgb[2]=239;//150
rgb.r=237;rgb.g=255;rgb.b=239;//150
}
}

#ifndef WLED_DISABLE_HUESYNC
void colorXYtoRGB(float x, float y, byte* rgb) //coordinates to rgb (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
void colorXYtoRGB(float x, float y, CRGBW &rgb) //coordinates to rgb (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
{
float z = 1.0f - x - y;
float X = (1.0f / y) * x;
Expand Down Expand Up @@ -519,9 +517,10 @@ void colorXYtoRGB(float x, float y, byte* rgb) //coordinates to rgb (https://www
b = 1.0f;
}
}
rgb[0] = byte(255.0f*r);
rgb[1] = byte(255.0f*g);
rgb[2] = byte(255.0f*b);
rgb = 0; // init to black, white is unused so make sure it does not contain garbage
rgb.r = byte(255.0f*r);
rgb.g = byte(255.0f*g);
rgb.b = byte(255.0f*b);
}

void colorRGBtoXY(const byte* rgb, float* xy) //rgb to coordinates (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
Expand All @@ -535,7 +534,7 @@ void colorRGBtoXY(const byte* rgb, float* xy) //rgb to coordinates (https://www.
#endif // WLED_DISABLE_HUESYNC

//RRGGBB / WWRRGGBB order for hex
void colorFromDecOrHexString(byte* rgb, const char* in)
void colorFromDecOrHexString(CRGBW &rgb, const char* in)
{
if (in[0] == 0) return;
char first = in[0];
Expand All @@ -548,30 +547,27 @@ void colorFromDecOrHexString(byte* rgb, const char* in)
{
c = strtoul(in, NULL, 10);
}

rgb[0] = R(c);
rgb[1] = G(c);
rgb[2] = B(c);
rgb[3] = W(c);
rgb = c;
}

//contrary to the colorFromDecOrHexString() function, this uses the more standard RRGGBB / RRGGBBWW order
bool colorFromHexString(byte* rgb, const char* in) {
bool colorFromHexString(CRGBW &rgb, const char* in) {
if (in == nullptr) return false;
size_t inputSize = strnlen(in, 9);
if (inputSize != 6 && inputSize != 8) return false;

uint32_t c = strtoul(in, NULL, 16);
rgb = 0; // init to black in case white is unused

if (inputSize == 6) {
rgb[0] = (c >> 16);
rgb[1] = (c >> 8);
rgb[2] = c ;
rgb.r = (c >> 16);
rgb.g = (c >> 8);
rgb.b = c ;
} else {
rgb[0] = (c >> 24);
rgb[1] = (c >> 16);
rgb[2] = (c >> 8);
rgb[3] = c ;
rgb.r = (c >> 24);
rgb.g = (c >> 16);
rgb.b = (c >> 8);
rgb.w = c ;
}
return true;
}
Expand All @@ -593,16 +589,15 @@ static inline float maxf(float v, float w)
uint32_t colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb)
{
//remember so that slow colorKtoRGB() doesn't have to run for every setPixelColor()
static byte correctionRGB[4] = {0,0,0,0};
static CRGBW correctionRGB = 0;
static uint16_t lastKelvin = 0;
if (lastKelvin != kelvin) colorKtoRGB(kelvin, correctionRGB); // convert Kelvin to RGB
lastKelvin = kelvin;
byte rgbw[4];
rgbw[0] = ((uint16_t) correctionRGB[0] * R(rgb)) /255; // correct R
rgbw[1] = ((uint16_t) correctionRGB[1] * G(rgb)) /255; // correct G
rgbw[2] = ((uint16_t) correctionRGB[2] * B(rgb)) /255; // correct B
rgbw[3] = W(rgb);
return RGBW32(rgbw[0],rgbw[1],rgbw[2],rgbw[3]);
CRGBW rgbw = rgb; // initializes white channel
rgbw.r = ((uint16_t) correctionRGB.r * R(rgb)) /255; // correct R
rgbw.g = ((uint16_t) correctionRGB.g * G(rgb)) /255; // correct G
rgbw.b = ((uint16_t) correctionRGB.b * B(rgb)) /255; // correct B
return rgbw.color32;
}

//approximates a Kelvin color temperature from an RGB color.
Expand Down
24 changes: 12 additions & 12 deletions wled00/colors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ void hsv2rgb_spectrum(const CHSV32& hsv, CRGBW& rgb);
void hsv2rgb_spectrum(const CHSV& hsv, CRGB& rgb);
void rgb2hsv(const CRGBW& rgb, CHSV32& hsv);
CHSV rgb2hsv(const CRGB c);
void colorHStoRGB(uint16_t hue, byte sat, byte* rgb);
void colorKtoRGB(uint16_t kelvin, byte* rgb);
void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum to rgb
void colorXYtoRGB(float x, float y, byte* rgb); // only defined if huesync disabled TODO
void colorHStoRGB(uint16_t hue, byte sat, CRGBW &rgb);
void colorKtoRGB(uint16_t kelvin, CRGBW &rgb);
void colorCTtoRGB(uint16_t mired, CRGBW &rgb); //white spectrum to rgb
void colorXYtoRGB(float x, float y, CRGBW &rgb); // only defined if huesync disabled TODO
void colorRGBtoXY(const byte* rgb, float* xy); // only defined if huesync disabled TODO
void colorFromDecOrHexString(byte* rgb, const char* in);
bool colorFromHexString(byte* rgb, const char* in);
void colorFromDecOrHexString(CRGBW &rgb, const char* in);
bool colorFromHexString(CRGBW &rgb, const char* in);
uint32_t colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb);
uint16_t approximateKelvinFromRGB(uint32_t rgb);
void setRandomColor(byte* rgb);
void setRandomColor(CRGBW &rgb);

// fast scaling function for colors, performs color*scale/256 for all four channels, speed over accuracy
// note: inlining uses less code than actual function calls
Expand Down Expand Up @@ -162,10 +162,10 @@ struct CRGBW {
constexpr CRGBW(CRGB rgb) __attribute__((always_inline)) : b(rgb.b), g(rgb.g), r(rgb.r), w(0) {}

// Constructor from CHSV32
inline CRGBW(CHSV32 hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h, hsv.s, hsv.v, raw, true); }
inline CRGBW(CHSV32 hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h, hsv.s, hsv.v, raw); w = 0; }

// Constructor from CHSV
inline CRGBW(CHSV hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h<<8, hsv.s, hsv.v, raw, true); }
inline CRGBW(CHSV hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h<<8, hsv.s, hsv.v, raw); w = 0;}

// Access as an array
inline const uint8_t& operator[](uint8_t x) const __attribute__((always_inline)) { return raw[x]; }
Expand All @@ -174,12 +174,12 @@ struct CRGBW {
inline CRGBW& operator=(uint32_t color) __attribute__((always_inline)) { color32 = color; return *this; }

// Assignment from CHSV32
inline CRGBW& operator=(CHSV32 hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h, hsv.s, hsv.v, raw, true); return *this; }
inline CRGBW& operator=(CHSV32 hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h, hsv.s, hsv.v, raw); w = 0; return *this; }

// Assignment from CHSV
inline CRGBW& operator=(CHSV hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h<<8, hsv.s, hsv.v, raw, true); return *this; }
inline CRGBW& operator=(CHSV hsv) __attribute__((always_inline)) { hsv2rgb_rainbow(hsv.h<<8, hsv.s, hsv.v, raw); w = 0; return *this; }

// Assignment from r, g, b, w
// Assignment from CRGB
inline CRGBW& operator=(const CRGB& rgb) __attribute__((always_inline)) { b = rgb.b; g = rgb.g; r = rgb.r; w = 0; return *this; }

// Conversion operator to uint32_t
Expand Down
2 changes: 1 addition & 1 deletion wled00/fcn_declare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ byte scaledBri(byte in);

#ifdef WLED_ENABLE_LOXONE
//lx_parser.cpp
bool parseLx(int lxValue, byte* rgbw);
bool parseLx(int lxValue, CRGBW &rgbw);
void parseLxJson(int lxValue, byte segId, bool secondary);
#endif

Expand Down
Loading
Loading