From d6f32a03fd8c51abd88d1cab9332c2c79aeac691 Mon Sep 17 00:00:00 2001 From: ThePendulum Date: Fri, 1 May 2026 05:24:51 +0200 Subject: [PATCH] Added tail light animation for police mode. --- QuadLightsV3.ino | 54 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/QuadLightsV3.ino b/QuadLightsV3.ino index e67a1f9..4397cd7 100644 --- a/QuadLightsV3.ino +++ b/QuadLightsV3.ino @@ -7,7 +7,10 @@ constexpr int KEEPALIVE_TIMEOUT = 5000; // ms constexpr int LEDS_TAIL_PIN = PA6; constexpr int LEDS_TAIL_LENGTH = 10; constexpr int LEDS_TAIL_BRIGHTNESS = 255; -constexpr int LEDS_TAIL_SIDE_LENGTH = 3; +constexpr int LEDS_TAIL_SIDE_LENGTH = 2; +constexpr int LEDS_TAIL_SIDE_MARGIN = 2; +constexpr int LEDS_TAIL_RIGHT_RANGE[] = {0, LEDS_TAIL_SIDE_LENGTH}; +constexpr int LEDS_TAIL_LEFT_RANGE[] = {LEDS_TAIL_LENGTH - LEDS_TAIL_SIDE_LENGTH, LEDS_TAIL_SIDE_LENGTH}; constexpr int LEDS_LEFT_PIN = PA5; constexpr int LEDS_RIGHT_PIN = PA7; @@ -161,6 +164,16 @@ void animateTailLight() { ledsTail.fill(COLOR_RED); } +void animateRightTailSide(uint32_t color) { + ledsTail.fill(color, 0, LEDS_TAIL_SIDE_LENGTH); + ledsTail.fill(COLOR_OFF, LEDS_TAIL_SIDE_LENGTH, LEDS_TAIL_SIDE_MARGIN); +} + +void animateLeftTailSide(uint32_t color) { + ledsTail.fill(color, LEDS_TAIL_LENGTH - LEDS_TAIL_SIDE_LENGTH, LEDS_TAIL_SIDE_LENGTH); + ledsTail.fill(COLOR_OFF, LEDS_TAIL_LENGTH - LEDS_TAIL_SIDE_LENGTH - LEDS_TAIL_SIDE_MARGIN, LEDS_TAIL_SIDE_MARGIN); +} + void animateDash() { ledsDash.clear(); } @@ -179,10 +192,6 @@ void animateIndicator(Direction direction) { ? ledsHeadLeft : ledsHeadRight; - int dashTargetIndex = direction == LEFT - ? 1 - : 0; - const long indicatorFrame = lround(animationFrame * INDICATOR_SPEED) % (LEDS_EDGE_LENGTH + INDICATOR_HOLD_FRAMES + INDICATOR_OFF_FRAMES); const long sweepEnd = LEDS_TOP_LENGTH; @@ -211,12 +220,29 @@ void animateIndicator(Direction direction) { } } + const int* tailRange = direction == LEFT + ? LEDS_TAIL_LEFT_RANGE + : LEDS_TAIL_RIGHT_RANGE; + + void (*animateTailSide)(uint32_t) = direction == LEFT + ? animateLeftTailSide + : animateRightTailSide; + + const int dashIndex = direction == LEFT + ? 1 + : 0; + if (indicatorFrame < sweepEnd) { - ledsDash.setPixelColor(dashTargetIndex, colorHSV(10, 1, (float)indicatorFrame / sweepEnd)); + const int colorAmberFaded = colorHSV(10, 1, (float)indicatorFrame / sweepEnd); + + animateTailSide(colorAmberFaded); + ledsDash.setPixelColor(dashIndex, colorAmberFaded); } else if (indicatorFrame < holdEnd) { - ledsDash.setPixelColor(dashTargetIndex, COLOR_AMBER); + animateTailSide(COLOR_AMBER); + ledsDash.setPixelColor(dashIndex, COLOR_AMBER); } else { - ledsDash.setPixelColor(dashTargetIndex, COLOR_OFF); + animateTailSide(COLOR_OFF); + ledsDash.setPixelColor(dashIndex, COLOR_OFF); } } @@ -246,18 +272,28 @@ void animatePolice() { ledsHeadLeft.fill(COLOR_POLICE_BLUE, 0, LEDS_EDGE_LENGTH); ledsHeadRight.fill(COLOR_OFF, 0, LEDS_EDGE_LENGTH); + // deliberately inverted from edge lights for a more alternating effect + animateLeftTailSide(COLOR_OFF); + animateRightTailSide(COLOR_POLICE_BLUE); + ledsDash.setPixelColor(1, COLOR_POLICE_BLUE); ledsDash.setPixelColor(0, COLOR_OFF); } else if (policeBeaconFrames[policeFrame] == POLICE_RIGHT) { ledsHeadLeft.fill(COLOR_OFF, 0, LEDS_EDGE_LENGTH); ledsHeadRight.fill(COLOR_POLICE_BLUE, 0, LEDS_EDGE_LENGTH); + animateLeftTailSide(COLOR_POLICE_BLUE); + animateRightTailSide(COLOR_OFF); + ledsDash.setPixelColor(1, COLOR_OFF); ledsDash.setPixelColor(0, COLOR_POLICE_BLUE); } else { ledsHeadLeft.fill(COLOR_OFF, 0, LEDS_EDGE_LENGTH); ledsHeadRight.fill(COLOR_OFF, 0, LEDS_EDGE_LENGTH); + animateLeftTailSide(COLOR_OFF); + animateRightTailSide(COLOR_OFF); + ledsDash.setPixelColor(1, COLOR_OFF); ledsDash.setPixelColor(0, COLOR_OFF); } @@ -294,7 +330,7 @@ void animateRainbow() { } */ - ledsTail.fill(ledsTail.ColorHSV(animationFrame * 1000 * RAINBOW_SPEED)); + ledsTail.fill(colorHSV(animationFrame * RAINBOW_SPEED)); ledsDash.setPixelColor(1, colorHSV(animationFrame * RAINBOW_SPEED)); ledsDash.setPixelColor(0, colorHSV(animationFrame * RAINBOW_SPEED + 90));