Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 21:44:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't discard cold/warm white brightness in constant brightness mode (#2136)

Browse source
This commit is contained in:
Oxan van Leeuwen 2021-08-10 03:30:29 +02:00 committed by GitHub
parent 1f42d32eb5
commit c038cf27a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
esphome/components/light/light_color_values.h
View file

@ -169,12 +169,18 @@ class LightColorValues {
const float cw_level = gamma_correct(this->cold_white_, gamma); const float cw_level = gamma_correct(this->cold_white_, gamma);
const float ww_level = gamma_correct(this->warm_white_, gamma); const float ww_level = gamma_correct(this->warm_white_, gamma);
const float white_level = gamma_correct(this->state_ * this->brightness_, gamma); const float white_level = gamma_correct(this->state_ * this->brightness_, gamma);
*cold_white = white_level * cw_level; if (!constant_brightness) {
*warm_white = white_level * ww_level; *cold_white = white_level * cw_level;
if (constant_brightness && (cw_level > 0 || ww_level > 0)) { *warm_white = white_level * ww_level;
const float sum = cw_level + ww_level; } else {
*cold_white /= sum; // Just multiplying by cw_level / (cw_level + ww_level) would divide out the brightness information from the
*warm_white /= sum; // cold_white and warm_white settings (i.e. cw=0.8, ww=0.4 would be identical to cw=0.4, ww=0.2), which breaks
// transitions. Use the highest value as the brightness for the white channels (the alternative, using cw+ww/2,
// reduces to cw/2 and ww/2, which would still limit brightness to 100% of a single channel, but isn't very
// useful in all other aspects -- that behaviour can also be achieved by limiting the output power).
const float sum = cw_level > 0 || ww_level > 0 ? cw_level + ww_level : 1; // Don't divide by zero.
*cold_white = white_level * std::max(cw_level, ww_level) * cw_level / sum;
*warm_white = white_level * std::max(cw_level, ww_level) * ww_level / sum;
} }
} else { } else {
*cold_white = *warm_white = 0; *cold_white = *warm_white = 0;