hellerbarde/esphome-wordclock
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: brightness attribute now correctly controls the brightness, even with active effect.

Browse source
This commit is contained in:
Philip Stark 2023-06-10 14:02:39 +02:00
parent e4bdcf71dc
commit 4962f344e3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/wordclock/wordclock.cpp
View file

@ -118,7 +118,7 @@ Color Wordclock::get_next_color(uint32_t position, const Color &current_color) {
uint32_t speed_ = 3; uint32_t speed_ = 3;
uint16_t width_ = 100; // Original width_ = 50 uint16_t width_ = 100; // Original width_ = 50
return get_next_color_base_(position, speed_, width_, current_color); return get_next_color_base_(position, speed_, width_, current_color);
} }
else { else {
return Color(this->on_color); return Color(this->on_color);
} }
@ -149,8 +149,8 @@ int8_t Wordclock::find_minute(uint8_t target_value) {
} }
void Wordclock::setup_transitions(uint32_t milliseconds) { void Wordclock::setup_transitions(uint32_t milliseconds) {
this->on_transformer->setup(0, this->brightness, milliseconds); this->on_transformer->setup(0, 255, milliseconds);
this->off_transformer->setup(this->brightness, 0, milliseconds); this->off_transformer->setup(255, 0, milliseconds);
} }
Wordclock::Wordclock( Wordclock::Wordclock(

2
components/wordclock/wordclock.h
View file

@ -167,7 +167,7 @@ protected:
const int32_t dy = -abs(y2 - y1), sy = y1 < y2 ? 1 : -1; const int32_t dy = -abs(y2 - y1), sy = y1 < y2 ? 1 : -1;
int32_t err = dx + dy; int32_t err = dx + dy;
while (true) { while (true) {
effect_color = this->get_next_color(x1 + y1, Color(0)); effect_color = this->get_next_color(x1 + y1, Color(0)) * this->brightness;
if (to_effect) { if (to_effect) {
color_to_draw = base_color.gradient(effect_color, transition_progress); color_to_draw = base_color.gradient(effect_color, transition_progress);
} else { } else {