Merge pull request #3944 from paspiz85/pas4

Using brightness in analog clock overlay
This commit is contained in:
Blaž Kristan 2024-05-03 09:56:14 +02:00 committed by GitHub
commit fa1aa1fe80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -25,11 +25,11 @@ void _overlayAnalogClock()
{ {
if (secondPixel < analogClock12pixel) if (secondPixel < analogClock12pixel)
{ {
strip.setRange(analogClock12pixel, overlayMax, 0xFF0000); strip.setRange(analogClock12pixel, overlayMax, color_fade(0xFF0000, bri));
strip.setRange(overlayMin, secondPixel, 0xFF0000); strip.setRange(overlayMin, secondPixel, color_fade(0xFF0000, bri));
} else } else
{ {
strip.setRange(analogClock12pixel, secondPixel, 0xFF0000); strip.setRange(analogClock12pixel, secondPixel, color_fade(0xFF0000, bri));
} }
} }
if (analogClock5MinuteMarks) if (analogClock5MinuteMarks)
@ -38,12 +38,12 @@ void _overlayAnalogClock()
{ {
unsigned pix = analogClock12pixel + roundf((overlaySize / 12.0f) *i); unsigned pix = analogClock12pixel + roundf((overlaySize / 12.0f) *i);
if (pix > overlayMax) pix -= overlaySize; if (pix > overlayMax) pix -= overlaySize;
strip.setPixelColor(pix, 0x00FFAA); strip.setPixelColor(pix, color_fade(0x00FFAA, bri));
} }
} }
if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, 0xFF0000); if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, color_fade(0xFF0000, bri));
strip.setPixelColor(minutePixel, 0x00FF00); strip.setPixelColor(minutePixel, color_fade(0x00FF00, bri));
strip.setPixelColor(hourPixel, 0x0000FF); strip.setPixelColor(hourPixel, color_fade(0x0000FF, bri));
} }