mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve behavior of color2 for unlinked RGBW and RGBWW lights

This commit is contained in:
Erik 2021-06-16 13:37:33 +02:00
parent ea83c8acd1
commit f2fd0750d5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasmota/xdrv_04_light.ino
View File

@ -2497,11 +2497,18 @@ void CmndSupportColor(void)
else { else {
#endif // USE_LIGHT_PALETTE #endif // USE_LIGHT_PALETTE
uint32_t old_bri = light_state.getBri(); uint32_t old_bri = light_state.getBri();
uint32_t old_bri_rgb = light_state.getBriRGB();
// change all channels to specified values // change all channels to specified values
light_controller.changeChannels(Light.entry_color); light_controller.changeChannels(Light.entry_color);
if (2 == XdrvMailbox.index) { if (2 == XdrvMailbox.index) {
// If Color2, set back old brightness // If Color2, set back old brightness
LightSetBriScaled(old_bri); if (light_controller.isCTRGBLinked()) {
// RGB and white are linked, adjust brightness of all channels
LightSetBriScaled(old_bri);
} else {
// RGB and white are unlinked, adjust brightness only of RGB channels
LightSetBri(Light.device, old_bri_rgb);
}
} }
#ifdef USE_LIGHT_PALETTE #ifdef USE_LIGHT_PALETTE
} }