Merge pull request #830 from kattni/cpb-cpx-neopixel-update

Updating NeoPixel code.

Author: kattni

Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_NeoPixel.py

@@ -1,40 +1,45 @@
-# CircuitPlaygroundExpress_NeoPixel
-
+# Circuit Playground NeoPixel
 import time
-
 import board
 import neopixel
 
-pixels = neopixel.NeoPixel(board.NEOPIXEL, 10, brightness=.2)
-pixels.fill((0, 0, 0))
-pixels.show()
+pixels = neopixel.NeoPixel(board.NEOPIXEL, 10, brightness=0.2, auto_write=False)
 
 # choose which demos to play
 # 1 means play, 0 means don't!
-simpleCircleDemo = 1
-flashDemo = 1
-rainbowDemo = 1
-rainbowCycleDemo = 1
+color_chase_demo = 1
+flash_demo = 1
+rainbow_demo = 1
+rainbow_cycle_demo = 1
 
 
 def wheel(pos):
     # Input a value 0 to 255 to get a color value.
     # The colours are a transition r - g - b - back to r.
+    if pos < 0 or pos > 255:
+        return (0, 0, 0)
     if pos < 85:
-        return (int(pos * 3), int(255 - (pos * 3)), 0)
-    elif pos < 170:
+        return (255 - pos * 3, pos * 3, 0)
+    if pos < 170:
         pos -= 85
-        return (int(255 - (pos * 3)), 0, int(pos * 3))
-    else:
-        pos -= 170
-        return (0, int(pos * 3), int(255 - pos * 3))
+        return (0, 255 - pos * 3, pos * 3)
+    pos -= 170
+    return (pos * 3, 0, 255 - pos * 3)
+
+
+def color_chase(color, wait):
+    for i in range(10):
+        pixels[i] = color
+        time.sleep(wait)
+        pixels.show()
+    time.sleep(0.5)
 
 
 def rainbow_cycle(wait):
     for j in range(255):
-        for i in range(len(pixels)):
-            idx = int((i * 256 / len(pixels)) + j * 10)
-            pixels[i] = wheel(idx & 255)
+        for i in range(10):
+            rc_index = (i * 256 // 10) + j * 5
+            pixels[i] = wheel(rc_index & 255)
         pixels.show()
         time.sleep(wait)
 
@@ -48,78 +53,42 @@ def rainbow(wait):
         time.sleep(wait)
 
 
-def simpleCircle(wait):
-    RED = 0x100000  # (0x10, 0, 0) also works
-    YELLOW = (0x10, 0x10, 0)
-    GREEN = (0, 0x10, 0)
-    AQUA = (0, 0x10, 0x10)
-    BLUE = (0, 0, 0x10)
-    PURPLE = (0x10, 0, 0x10)
-    BLACK = (0, 0, 0)
-
-    for i in range(len(pixels)):
-        pixels[i] = RED
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = YELLOW
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = GREEN
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = AQUA
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = BLUE
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = PURPLE
-        time.sleep(wait)
-    time.sleep(1)
-
-    for i in range(len(pixels)):
-        pixels[i] = BLACK
-        time.sleep(wait)
-    time.sleep(1)
-
+RED = (255, 0, 0)
+YELLOW = (255, 150, 0)
+GREEN = (0, 255, 0)
+CYAN = (0, 255, 255)
+BLUE = (0, 0, 255)
+PURPLE = (180, 0, 255)
+WHITE = (255, 255, 255)
+OFF = (0, 0, 0)
 
 while True:
-    if simpleCircleDemo:
-        print('Simple Circle Demo')
-        simpleCircle(.05)
-
-    if flashDemo:  # this will play if flashDemo = 1 up above
-        print('Flash Demo')
-        pixels.fill((255, 0, 0))
+    if color_chase_demo:
+        color_chase(RED, 0.1)  # Increase the number to slow down the color chase
+        color_chase(YELLOW, 0.1)
+        color_chase(GREEN, 0.1)
+        color_chase(CYAN, 0.1)
+        color_chase(BLUE, 0.1)
+        color_chase(PURPLE, 0.1)
+        color_chase(OFF, 0.1)
+
+    if flash_demo:
+        pixels.fill(RED)
         pixels.show()
-        time.sleep(.25)
-
-        pixels.fill((0, 255, 0))
+        # Increase or decrease to change the speed of the solid color change.
+        time.sleep(1)
+        pixels.fill(GREEN)
         pixels.show()
-        time.sleep(.25)
-
-        pixels.fill((0, 0, 255))
+        time.sleep(1)
+        pixels.fill(BLUE)
         pixels.show()
-        time.sleep(.25)
-
-        pixels.fill((255, 255, 255))
+        time.sleep(1)
+        pixels.fill(WHITE)
         pixels.show()
-        time.sleep(.25)
+        time.sleep(1)
 
-    if rainbowDemo:
-        print('Rainbow Demo')
-        rainbow(.001)
+    if rainbow_cycle_demo:
+        rainbow_cycle(0.05)  # Increase the number to slow down the rainbow.
 
-    if rainbowCycleDemo:
-        print('Rainbow Cycle Demo')
-        rainbow_cycle(.001)
+    if rainbow_demo:
+        rainbow(0.05)  # Increase the number to slow down the rainbow.