Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.d/chord-clock-light.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed:
The light no longer dips while the Up+Down clock and the sleep screen after it draw; it fades in, holds, and fades out.
5 changes: 3 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3045,7 +3045,8 @@ static void updateFlashDuckLocked() {
// Never duck below 2% of full: lower duty shifts the frontlight color. Every duck level below derives from this.
const unsigned long minPct = std::max<unsigned long>(KNOBS.flashDuckMinPct, 2);
if (!flashDuckActive) {
if (!ducking || holdLate || !SETTINGS.frontlightFlashDuck || !Frontlight.isOn() ||
// The Up+Down clock is a peek: its two refreshes (clock, sleep screen) would pump the light it just faded in.
if (!ducking || holdLate || wallpaperChordWake || !SETTINGS.frontlightFlashDuck || !Frontlight.isOn() ||
Frontlight.idleDimPercent() != 100) {
return;
}
Expand Down Expand Up @@ -3156,7 +3157,7 @@ static void updateFlashDuckLocked() {
// dim or at the floor it does nothing, so don't tick the loop at 10 ms for it.
static bool flashDuckPending() {
if (flashDuckActive) return true;
if (!SETTINGS.frontlightFlashDuck || !Frontlight.isOn() || Frontlight.idleDimPercent() != 100 ||
if (wallpaperChordWake || !SETTINGS.frontlightFlashDuck || !Frontlight.isOn() || Frontlight.idleDimPercent() != 100 ||
Frontlight.brightness() <= std::max<unsigned long>(KNOBS.flashDuckMinPct, 2)) {
return false;
}
Expand Down