going for v0.3.0

Author: trevorwslee

experiments/picopio/pio_neo_blink.py

@@ -1,4 +1,4 @@
-# https://docs.micropython.org/en/latest/library/rp2.html
+# PIO reference: https://docs.micropython.org/en/latest/library/rp2.html
 
 import time
 import rp2
@@ -18,6 +18,8 @@
 # - 1: 16 cycles high + 9 cycles low
 # afterward, delay for 300us
 
+
+NUM_PIXELS = 4
 NEO_PIXELS_IN_PIN = 22
 
 @rp2.asm_pio(set_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT)  # SHIFT_LEFT: i.e. most significant bit first
@@ -26,10 +28,10 @@ def neo_prog():
     mov(y, osr)                  # y <= number of pixels - 1
     label("loop_pixel")
     mov(isr, y)                  # isr (pixel counter) <= y
-    pull()                       # sor <= 24 bits GRB
+    pull()                       # osr <= 24 bits GRB
     set(x, 23)                   # x (bit counter) <= 23
     label("loop_pixel_bit")
-    out(y, 1)                    # y <= left-most 1 bit of sor
+    out(y, 1)                    # y <= left-most 1 bit of osr
     jmp(not_y, "bit_0")
     set(pins, 1).delay(15)       # 1: high (16 cycles)
     set(pins, 0).delay(8)        # 1: low (9 cycles)
@@ -41,15 +43,11 @@ def neo_prog():
     jmp(x_dec, "loop_pixel_bit") # x is bit counter
     mov(y, isr)                  # y <= isr (pixel counter)
     jmp(y_dec, "loop_pixel")     # y is pixel counter
-    # label("debug")
-    # set(y, 8)
-    # label("debug_2")
-    # mov(isr, y)
-    # push()
 
 sm = rp2.StateMachine(0, neo_prog, freq=20_000_000, set_base=Pin(NEO_PIXELS_IN_PIN))
 sm.active(1)
 
+
 def ShowNeoPixels(*pixels):
     '''
     each pixel is the tuple (r, g, b)
@@ -63,25 +61,14 @@ def ShowNeoPixels(*pixels):
         else:
             (r, g, b) = (0, 0, 0)
         grb = (g << 16) + (r << 8) + b    # the order is G R B
-        #print(f". [{i}] = {pixel} ({grb})")
         sm.put(grb, 8)                    # a word is 32 bits, so, pre-shift out (discard) 8 bits, leaving 24 bits of the GRB
     time.sleep_us(300)                    # make sure the NeoPixels is reset for the next round
-    # res = sm.get()
-    # print(f"got result {res}")
 
 
-NUM_PIXELS = 4
 Pixels = []
 for i in range(NUM_PIXELS):
     Pixels.append(None)
 
-# Pixels[0] = (128, 0, 0)
-# Pixels[1] = (0, 128, 0)
-# Pixels[2] = (0, 0, 128)
-# Pixels[3] = (32, 32, 32)
-# ShowNeoPixels(*Pixels)    
-    
-
 rgb = 0
 i = 0
 while True:
@@ -97,4 +84,5 @@ def ShowNeoPixels(*pixels):
     Pixels[i] = None
     ShowNeoPixels(*Pixels)
     rgb = (rgb + 1) % 3
-    i = (i + 1) % NUM_PIXELS    
+    i = (i + 1) % NUM_PIXELS
+    

samples/neopixels/main.py

@@ -6,6 +6,9 @@
 
 try:
 
+    if False:
+        raise Exception("I don't want to use PIO")
+
     import rp2
     from machine import Pin
 
@@ -28,10 +31,10 @@ def neo_prog():
         mov(y, osr)                  # y <= number of pixels - 1
         label("loop_pixel")
         mov(isr, y)                  # isr (pixel counter) <= y
-        pull()                       # sor <= 24 bits GRB
+        pull()                       # osr <= 24 bits GRB
         set(x, 23)                   # x (bit counter) <= 23
         label("loop_pixel_bit")
-        out(y, 1)                    # y <= left-most 1 bit of sor
+        out(y, 1)                    # y <= left-most 1 bit of osr
         jmp(not_y, "bit_0")
         set(pins, 1).delay(15)       # 1: high (16 cycles)
         set(pins, 0).delay(8)        # 1: low (9 cycles)