Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-28 17:54:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Don't stop effects if brightness goes to zero (#2134)

Browse source
This commit is contained in:
Oxan van Leeuwen 2021-08-07 13:24:47 +02:00 committed by GitHub
parent 5bfac5ec09
commit 1d6b4bfcef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
esphome/components/light/light_call.cpp
View file

@ -226,6 +226,9 @@ LightColorValues LightCall::validate_() {
VALIDATE_RANGE(warm_white, "Warm white") VALIDATE_RANGE(warm_white, "Warm white")
VALIDATE_RANGE_(color_temperature, "Color temperature", traits.get_min_mireds(), traits.get_max_mireds()) VALIDATE_RANGE_(color_temperature, "Color temperature", traits.get_min_mireds(), traits.get_max_mireds())
// Flag whether an explicit turn off was requested, in which case we'll also stop the effect.
bool explicit_turn_off_request = this->state_.has_value() && !*this->state_;
// Turn off when brightness is set to zero, and reset brightness (so that it has nonzero brightness when turned on). // Turn off when brightness is set to zero, and reset brightness (so that it has nonzero brightness when turned on).
if (this->brightness_.has_value() && *this->brightness_ == 0.0f) { if (this->brightness_.has_value() && *this->brightness_ == 0.0f) {
this->state_ = optional<float>(false); this->state_ = optional<float>(false);
@ -238,6 +241,7 @@ LightColorValues LightCall::validate_() {
this->color_brightness_ = optional<float>(1.0f); this->color_brightness_ = optional<float>(1.0f);
} }
// Create color values for the light with this call applied.
auto v = this->parent_->remote_values; auto v = this->parent_->remote_values;
if (this->color_mode_.has_value()) if (this->color_mode_.has_value())
v.set_color_mode(*this->color_mode_); v.set_color_mode(*this->color_mode_);
@ -318,7 +322,7 @@ LightColorValues LightCall::validate_() {
if (this->has_effect_()) { if (this->has_effect_()) {
ESP_LOGW(TAG, "'%s' - Cannot start an effect when turning off!", name); ESP_LOGW(TAG, "'%s' - Cannot start an effect when turning off!", name);
this->effect_.reset(); this->effect_.reset();
} else if (this->parent_->active_effect_index_ != 0) { } else if (this->parent_->active_effect_index_ != 0 && explicit_turn_off_request) {
// Auto turn off effect // Auto turn off effect
this->effect_ = 0; this->effect_ = 0;
} }