Merge pull request #6894 from s-hadinger/fix_6887_pwm

Fix bad PWM Power control with SetOption68
This commit is contained in:
Theo Arends 2019-11-10 12:06:28 +01:00 committed by GitHub
commit 4189bf4f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1683,15 +1683,15 @@ void LightAnimate(void)
// Light.power, Light.new_color[0], Light.new_color[1], Light.new_color[2],
// Light.new_color[3], Light.new_color[4]);
// #endif
}
if (!light_controller.isCTRGBLinked()) {
// we have 2 power bits for RGB and White
if (0 == (Light.power & 1)) {
Light.new_color[0] = Light.new_color[1] = Light.new_color[2] = 0;
}
if (0 == (Light.power & 2)) {
Light.new_color[3] = Light.new_color[4] = 0;
} else {
if (!light_controller.isCTRGBLinked()) {
// we have 2 power bits for RGB and White
if (0 == (Light.power & 1)) {
Light.new_color[0] = Light.new_color[1] = Light.new_color[2] = 0;
}
if (0 == (Light.power & 2)) {
Light.new_color[3] = Light.new_color[4] = 0;
}
}
}