diff --git a/QuadLightsV3.ino b/QuadLightsV3.ino index 69ed89d..f702599 100644 --- a/QuadLightsV3.ino +++ b/QuadLightsV3.ino @@ -74,11 +74,12 @@ enum Mode { MODE_HAZARD, MODE_POLICE, MODE_RAINBOW, + MODE_KITT, MODE_COUNT, }; // Mode activeMode = MODE_HEAD; -Mode activeMode = MODE_RAINBOW; +Mode activeMode = MODE_KITT; uint32_t colorHSV(float hue, float sat = 1.0, float val = 1.0) { return Adafruit_NeoPixel::ColorHSV( @@ -99,6 +100,7 @@ const uint32_t COLOR_POLICE_BLUE = ledsTail.Color(0, 0, 255, 0); const uint32_t COLOR_POLICE_RED = ledsTail.Color(255, 0, 0, 0); unsigned long animationFrame = 0; +unsigned long stableAnimationFrame = 0; unsigned long lastFrame = 0; unsigned long lastPedalPress = millis(); @@ -234,10 +236,6 @@ void animateIndicator(Direction direction) { } } - const int* tailRange = direction == LEFT - ? LEDS_TAIL_LEFT_RANGE - : LEDS_TAIL_RIGHT_RANGE; - void (*animateTailSide)(uint32_t, bool) = direction == LEFT ? animateLeftTailSide : animateRightTailSide; @@ -322,32 +320,37 @@ void animatePolice() { } constexpr float RAINBOW_SPEED = 2.0; -constexpr float RAINBOW_DENSITY = 5.0; +constexpr float RAINBOW_DENSITY = 10.0; void animateRainbow() { - for (int ledIndex = 0; ledIndex < LEDS_HEAD_LENGTH; ledIndex++) { - const uint32_t pixelColor = colorHSV((animationFrame * RAINBOW_SPEED) + (ledIndex * RAINBOW_DENSITY)); + // EDGES, flowing color + for (int ledIndex = LEDS_TOP_LENGTH - 1; ledIndex >= 0; ledIndex--) { + const uint32_t pixelColor = colorHSV((stableAnimationFrame * RAINBOW_SPEED) + (ledIndex * RAINBOW_DENSITY)); ledsHeadLeft.setPixelColor(ledIndex, pixelColor); + ledsHeadLeft.setPixelColor(LEDS_EDGE_LENGTH - ledIndex, pixelColor); + ledsHeadRight.setPixelColor(ledIndex, pixelColor); + ledsHeadRight.setPixelColor(LEDS_EDGE_LENGTH - ledIndex, pixelColor); } - /* + // RINGS, single color + ledsHeadLeft.fill(colorHSV(stableAnimationFrame * RAINBOW_SPEED), LEDS_EDGE_LENGTH, LEDS_RING_LENGTH); + ledsHeadRight.fill(colorHSV(stableAnimationFrame * RAINBOW_SPEED), LEDS_EDGE_LENGTH, LEDS_RING_LENGTH); + for (int ledIndex = 0; ledIndex < LEDS_TAIL_LENGTH; ledIndex++) { - const uint32_t pixelColor = ledsHeadLeft.ColorHSV((animationFrame * 1000 * RAINBOW_SPEED) + (ledIndex * 1000 * RAINBOW_DENSITY * 5), 255, 255); + const int distFromCenter = abs(ledIndex * 2 - (LEDS_TAIL_LENGTH - 1)); + const uint32_t pixelColor = colorHSV((stableAnimationFrame * RAINBOW_SPEED) - (distFromCenter * RAINBOW_DENSITY * 2)); - if (ledIndex <= 5) { - ledsTail.setPixelColor(ledIndex, pixelColor); - } else { - ledsTail.setPixelColor(LEDS_TAIL_LENGTH - ledIndex, pixelColor); - } + ledsTail.setPixelColor(ledIndex, pixelColor); } - */ - ledsTail.fill(colorHSV(animationFrame * RAINBOW_SPEED)); + ledsDash.setPixelColor(1, colorHSV(stableAnimationFrame * RAINBOW_SPEED)); + ledsDash.setPixelColor(0, colorHSV(stableAnimationFrame * RAINBOW_SPEED + 90)); +} - ledsDash.setPixelColor(1, colorHSV(animationFrame * RAINBOW_SPEED)); - ledsDash.setPixelColor(0, colorHSV(animationFrame * RAINBOW_SPEED + 90)); +void animateKitt() { + // not implemented } void animate(long now) { @@ -369,6 +372,10 @@ void animate(long now) { animateIndicator(RIGHT); } + if (activeMode == MODE_KITT) { + animateKitt(); + } + if (now - lastPedalRelease < 1500) { animateBrake(); } @@ -415,6 +422,7 @@ void shutdown() { void restart() { lastFrame = millis(); animationFrame = 0; + stableAnimationFrame = 0; isOff = false; digitalWrite(PIN_BUCK, BUCK_ON); @@ -500,6 +508,7 @@ void loop() { if (!isOff && now - lastFrame >= ANIMATION_INTERVAL) { lastFrame += ANIMATION_INTERVAL; animationFrame += 1; + stableAnimationFrame += 1; animate(now); render();