Commit ae634a9

authored

fix(zigbee): Fix RGB color calculation (#11624)

1 parent f08efa1 commit ae634a9Copy full SHA for ae634a9

File tree

3 files changed

+11

-9

lines changed

cores/esp32
- ColorFormat.c
- ColorFormat.h
libraries/Zigbee/src/ep
- ZigbeeColorDimmableLight.cpp

3 files changed

+11

-9

lines changed

`‎cores/esp32/ColorFormat.c`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,10 @@ espHsvColor_t espRgbColorToHsvColor(espRgbColor_t rgb) {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`espRgbColor_t espXYColorToRgbColor(uint8_t Level, espXyColor_t xy) {`
`122`		`- return espXYToRgbColor(Level, xy.x, xy.y);`
	`122`	`+ return espXYToRgbColor(Level, xy.x, xy.y, true);`
`123`	`123`	`}`
`124`	`124`
`125`		`-espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t current_Y) {`
	`125`	`+espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t current_Y, booladdXYZScaling) {`
`126`	`126`	`// convert xyY color space to RGB`
`127`	`127`
`128`	`128`	`// https://www.easyrgb.com/en/math.php`
`@@ -156,9 +156,11 @@ espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t curren`
`156`	`156`	`// X, Y and Z input refer to a D65/2° standard illuminant.`
`157`	`157`	`// sR, sG and sB (standard RGB) output range = 0 ÷ 255`
`158`	`158`	`// convert XYZ to RGB - CIE XYZ to sRGB`
`159`		`- X = X / 100.0f;`
`160`		`- Y = Y / 100.0f;`
`161`		`- Z = Z / 100.0f;`
	`159`	`+ if (addXYZScaling) {`
	`160`	`+ X = X / 100.0f;`
	`161`	`+ Y = Y / 100.0f;`
	`162`	`+ Z = Z / 100.0f;`
	`163`	`+ }`
`162`	`164`
`163`	`165`	`r = (X * 3.2406f) - (Y * 1.5372f) - (Z * 0.4986f);`
`164`	`166`	`g = -(X * 0.9689f) + (Y * 1.8758f) + (Z * 0.0415f);`

`‎cores/esp32/ColorFormat.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#pragma once`
`20`	`20`
`21`	`21`	`#include <stdint.h>`
	`22`	`+#include <stdbool.h>`
`22`	`23`	`#ifdef __cplusplus`
`23`	`24`	`extern "C" {`
`24`	`25`	`#endif`
`@@ -49,7 +50,7 @@ typedef struct HsvColor_t espHsvColor_t;`
`49`	`50`	`typedef struct XyColor_t espXyColor_t;`
`50`	`51`	`typedef struct CtColor_t espCtColor_t;`
`51`	`52`
`52`		`-espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t current_Y);`
	`53`	`+espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t current_Y, booladdXYZScaling);`
`53`	`54`	`espRgbColor_t espXYColorToRgb(uint8_t Level, espXyColor_t xy);`
`54`	`55`	`espXyColor_t espRgbColorToXYColor(espRgbColor_t rgb);`
`55`	`56`	`espXyColor_t espRgbToXYColor(uint8_t r, uint8_t g, uint8_t b);`

`‎libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,22 +76,21 @@ void ZigbeeColorDimmableLight::zbAttributeSet(const esp_zb_zcl_set_attr_value_me`
`76`	`76`	`return;`
`77`	`77`	`} else {`
`78`	`78`	`log_w("Received message ignored. Attribute ID: %d not supported for Level Control", message->attribute.id);`
`79`		`- //TODO: implement more attributes -> includes/zcl/esp_zigbee_zcl_level.h`
`80`	`79`	`}`
`81`	`80`	`} else if (message->info.cluster == ESP_ZB_ZCL_CLUSTER_ID_COLOR_CONTROL) {`
`82`	`81`	`if (message->attribute.id == ESP_ZB_ZCL_ATTR_COLOR_CONTROL_CURRENT_X_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_U16) {`
`83`	`82`	`uint16_t light_color_x = ((uint16_t )message->attribute.data.value);`
`84`	`83`	`uint16_t light_color_y = getCurrentColorY();`
`85`	`84`	`//calculate RGB from XY and call setColor()`
`86`		`- _current_color = espXYToRgbColor(255, light_color_x, light_color_y); //TODO: Check if level is correct`
	`85`	`+ _current_color = espXYToRgbColor(255, light_color_x, light_color_y, false);`
`87`	`86`	`lightChanged();`
`88`	`87`	`return;`
`89`	`88`
`90`	`89`	`} else if (message->attribute.id == ESP_ZB_ZCL_ATTR_COLOR_CONTROL_CURRENT_Y_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_U16) {`
`91`	`90`	`uint16_t light_color_x = getCurrentColorX();`
`92`	`91`	`uint16_t light_color_y = ((uint16_t )message->attribute.data.value);`
`93`	`92`	`//calculate RGB from XY and call setColor()`
`94`		`- _current_color = espXYToRgbColor(255, light_color_x, light_color_y); //TODO: Check if level is correct`
	`93`	`+ _current_color = espXYToRgbColor(255, light_color_x, light_color_y, false);`
`95`	`94`	`lightChanged();`
`96`	`95`	`return;`
`97`	`96`	`} else if (message->attribute.id == ESP_ZB_ZCL_ATTR_COLOR_CONTROL_CURRENT_HUE_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_U8) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ae634a9

File tree

3 files changed

3 files changed

`‎cores/esp32/ColorFormat.c`

`‎cores/esp32/ColorFormat.h`

`‎libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp`

0 commit comments