Merge remote-tracking branch 'adafruit/master' into file-rename

Author: kattni

Circuit_Playground_Bluefruit_NeoPixel_Controller/NeoPixel_Animator.py

@@ -28,15 +28,13 @@
 
 # Setup for comet animation
 COMET_SPEED = 0.03  # Lower numbers increase the animation speed
-COMET_INITIAL_COLOR = color.MAGENTA  # Color before controller is connected
 CPB_COMET_TAIL_LENGTH = 5  # The length of the comet on the Circuit Playground Bluefruit
 STRIP_COMET_TAIL_LENGTH = 15  # The length of the comet on the NeoPixel strip
 CPB_COMET_BOUNCE = False  # Set to True to make the comet "bounce" the opposite direction on CPB
 STRIP_COMET_BOUNCE = True  # Set to False to stop comet from "bouncing" on NeoPixel strip
 
 # Setup for sparkle animation
 SPARKLE_SPEED = 0.03  # Lower numbers increase the animation speed
-SPARKLE_INITIAL_COLOR = color.PURPLE  # Color before controller is connected
 
 # Create the NeoPixel strip
 strip_pixels = neopixel.NeoPixel(board.A1, STRIP_PIXEL_NUMBER, auto_write=False)
@@ -54,14 +52,14 @@
         sync=True
     ),
     AnimationGroup(
-        Comet(cpb.pixels, COMET_SPEED, COMET_INITIAL_COLOR, tail_length=CPB_COMET_TAIL_LENGTH,
+        Comet(cpb.pixels, COMET_SPEED, color.MAGENTA, tail_length=CPB_COMET_TAIL_LENGTH,
               bounce=CPB_COMET_BOUNCE),
-        Comet(strip_pixels, COMET_SPEED, COMET_INITIAL_COLOR, tail_length=STRIP_COMET_TAIL_LENGTH,
+        Comet(strip_pixels, COMET_SPEED, color.MAGENTA, tail_length=STRIP_COMET_TAIL_LENGTH,
               bounce=STRIP_COMET_BOUNCE)
     ),
     AnimationGroup(
-        Sparkle(cpb.pixels, SPARKLE_SPEED, SPARKLE_INITIAL_COLOR),
-        Sparkle(strip_pixels, SPARKLE_SPEED, SPARKLE_INITIAL_COLOR)
+        Sparkle(cpb.pixels, SPARKLE_SPEED, color.PURPLE),
+        Sparkle(strip_pixels, SPARKLE_SPEED, color.PURPLE)
     ),
 )