Michel2/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-07-28 04:15:53 +00:00
Code Issues Releases Activity

Merge pull request #12380 from emontnemery/color2_tweak

Browse Source 
Improve behavior of color2 for unlinked RGBW and RGBWW lights
This commit is contained in:
Theo Arends
2021-06-17 09:34:13 +02:00
committed by GitHub
parent 8a8663b604 f2fd0750d5
commit 87592582c5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasmota/xdrv_04_light.ino
+8 -1
View File
@@ -2497,11 +2497,18 @@ void CmndSupportColor(void)
else {
#endif // USE_LIGHT_PALETTE
uint32_t old_bri = light_state.getBri();
uint32_t old_bri_rgb = light_state.getBriRGB();
// change all channels to specified values
light_controller.changeChannels(Light.entry_color);
if (2 == XdrvMailbox.index) {
// 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
}