Revert to basic led driver

Co-authored-by: Cursor <cursoragent@cursor.com>

pico/lib/dma.py

@@ -0,0 +1,117 @@
+from machine import Pin
+from rp2 import PIO, StateMachine, asm_pio
+from time import sleep
+import array
+import uctypes
+from uctypes import BF_POS, BF_LEN, UINT32, BFUINT32, struct
+
+PIO0_BASE       = 0x50200000
+PIO1_BASE       = 0x50300000
+DMA_BASE        = 0x50000000
+DMA_CHAN_WIDTH  = 0x40
+DMA_CHAN_COUNT  = 12
+
+DMA_SIZE_BYTE = 0x0
+DMA_SIZE_HALFWORD = 0x1
+DMA_SIZE_WORD = 0x2
+
+# DMA: RP2040 datasheet 2.5.7
+DMA_CTRL_TRIG_FIELDS = {
+    "AHB_ERROR":   31<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "READ_ERROR":  30<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "WRITE_ERROR": 29<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "BUSY":        24<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "SNIFF_EN":    23<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "BSWAP":       22<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "IRQ_QUIET":   21<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "TREQ_SEL":    15<<BF_POS | 6<<BF_LEN | BFUINT32,
+    "CHAIN_TO":    11<<BF_POS | 4<<BF_LEN | BFUINT32,
+    "RING_SEL":    10<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "RING_SIZE":    6<<BF_POS | 4<<BF_LEN | BFUINT32,
+    "INCR_WRITE":   5<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "INCR_READ":    4<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "DATA_SIZE":    2<<BF_POS | 2<<BF_LEN | BFUINT32,
+    "HIGH_PRIORITY":1<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "EN":           0<<BF_POS | 1<<BF_LEN | BFUINT32
+}
+# Channel-specific DMA registers
+DMA_CHAN_REGS = {
+    "READ_ADDR_REG":       0x00|UINT32,
+    "WRITE_ADDR_REG":      0x04|UINT32,
+    "TRANS_COUNT_REG":     0x08|UINT32,
+    "CTRL_TRIG_REG":       0x0c|UINT32,
+    "CTRL_TRIG":          (0x0c,DMA_CTRL_TRIG_FIELDS)
+}
+
+# General DMA registers
+DMA_REGS = {
+    "INTR":               0x400|UINT32,
+    "INTE0":              0x404|UINT32,
+    "INTF0":              0x408|UINT32,
+    "INTS0":              0x40c|UINT32,
+    "INTE1":              0x414|UINT32,
+    "INTF1":              0x418|UINT32,
+    "INTS1":              0x41c|UINT32,
+    "TIMER0":             0x420|UINT32,
+    "TIMER1":             0x424|UINT32,
+    "TIMER2":             0x428|UINT32,
+    "TIMER3":             0x42c|UINT32,
+    "MULTI_CHAN_TRIGGER": 0x430|UINT32,
+    "SNIFF_CTRL":         0x434|UINT32,
+    "SNIFF_DATA":         0x438|UINT32,
+    "FIFO_LEVELS":        0x440|UINT32,
+    "CHAN_ABORT":         0x444|UINT32
+}
+
+DMA_CHANS = [struct(DMA_BASE + n*DMA_CHAN_WIDTH, DMA_CHAN_REGS) for n in range(0,DMA_CHAN_COUNT)]
+DMA_DEVICE = struct(DMA_BASE, DMA_REGS)
+
+DMA_CH0_AL3_TRANS_COUNT = DMA_BASE + 0x38
+
+class PIO_DMA_Transfer():
+    def __init__(self, dma_channel, sm_num, block_size, transfer_count):
+        self.dma_chan = DMA_CHANS[dma_channel]
+        self.channel_number = dma_channel
+       
+        if (sm_num >= 0 and sm_num < 4):
+            self.dma_chan.WRITE_ADDR_REG = PIO0_BASE + 0x10 + sm_num *4
+            self.dma_chan.CTRL_TRIG.TREQ_SEL = sm_num
+        elif (sm_num < 8):
+            self.dma_chan.WRITE_ADDR_REG = PIO1_BASE + 0x10 + (sm_num-4) *4
+            self.dma_chan.CTRL_TRIG.TREQ_SEL = sm_num + 4
+        
+        if (block_size == 8):
+            self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_BYTE
+        if (block_size == 16):
+            self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_HALFWORD
+        if (block_size == 32):
+            self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_WORD
+            
+        self.dma_chan.TRANS_COUNT_REG = transfer_count
+        
+        #Do I just always want these?
+        self.dma_chan.CTRL_TRIG.INCR_WRITE = 0
+        self.dma_chan.CTRL_TRIG.INCR_READ = 1
+            
+    def start_transfer(self, buffer):
+        self.dma_chan.READ_ADDR_REG = uctypes.addressof(buffer)
+        self.dma_chan.CTRL_TRIG.EN = 1
+
+    def transfer_count(self):
+        return self.dma_chan.TRANS_COUNT_REG
+    
+    def busy(self):
+        if self.dma_chan.CTRL_TRIG.DATA_SIZE == 1:
+            return True
+        else:
+            return False
+        
+
+        
+
+
+
+
+
+
+

pico/lib/ws2812.py

@@ -0,0 +1,68 @@
+
+import array, time
+from machine import Pin
+import rp2
+from time import sleep
+import dma
+
+@rp2.asm_pio(sideset_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT, autopull=True, pull_thresh=8)
+def ws2812():
+    T1 = 2
+    T2 = 5
+    T3 = 3
+    wrap_target()
+    label("bitloop")
+    out(x, 1)               .side(0)    [T3 - 1]
+    jmp(not_x, "do_zero")   .side(1)    [T1 - 1]
+    jmp("bitloop")          .side(1)    [T2 - 1]
+    label("do_zero")
+    nop()                   .side(0)    [T2 - 1]
+    wrap()
+
+class WS2812B: 
+    def __init__(self, num_leds, pin, state_machine, brightness=0.1, invert=False):
+        self.sm = rp2.StateMachine(state_machine, ws2812, freq=8_000_000, sideset_base=Pin(pin))
+        self.sm.active(1)
+        self.ar = bytearray(num_leds*3)
+        self.num_leds = num_leds
+        self.brightness = brightness
+        self.invert = invert
+        self.pio_dma = dma.PIO_DMA_Transfer(state_machine+4, state_machine, 8, num_leds*3)
+
+    def show(self):
+        self.pio_dma.start_transfer(self.ar)
+        
+    def set(self, i, color):
+        self.ar[i*3] = int(color[1]*self.brightness)
+        self.ar[i*3+1] = int(color[0]*self.brightness)
+        self.ar[i*3+2] = int(color[2]*self.brightness)
+    
+    def fill(self, color):
+        for i in range(self.num_leds):
+            self.set(i, color)
+
+    def busy(self):
+        return self.pio_dma.busy()
+    
+    BLACK = (0, 0, 0)
+    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)
+    COLORS = (BLACK, RED, YELLOW, GREEN, CYAN, BLUE, PURPLE, WHITE)
+
+if __name__ == "__main__":
+    num_leds, pin, sm, brightness = 293, 2, 0, 0.1
+    ws0 = WS2812B(num_leds, pin, sm, brightness)
+    while True:
+        for color in ws0.COLORS:
+            ws0.fill(color)
+            ws0.show()
+            time.sleep(1)
+
+
+
+

pico/test/leds.py

@@ -0,0 +1,32 @@
+from ws2812 import WS2812B
+import time
+
+
+# --- Rainbow pattern (outside ws2812): pregen double buffer, show via head offset ---
+
+
+# --- Strips + rainbow buffers per strip ---
+
+strips = []
+pins = ((2, 291), 
+        (3, 290), 
+        (4, 283), 
+        (7, 278),
+        (0, 275), 
+        (28, 278),
+        (29, 283),
+        (6, 290))
+
+sm = 0
+
+for pin, num_leds in pins:
+    print(pin, num_leds)
+    ws = WS2812B(num_leds, pin, sm, brightness=1.0)  # 1.0 so fill() is visible
+    strips.append(ws)
+    sm += 1
+    ws.fill((255,0,0))
+    ws.show()
+    time.sleep(1)
+   
+
+

src/dma.py

@@ -1,12 +1,13 @@
+# DMA driver for Raspberry Pi Pico 2 (RP2350) only.
 from machine import Pin
 from rp2 import PIO, StateMachine, asm_pio
-from time import sleep
 import array
 import uctypes
 from uctypes import BF_POS, BF_LEN, UINT32, BFUINT32, struct
 
 PIO0_BASE       = 0x50200000
 PIO1_BASE       = 0x50300000
+PIO2_BASE       = 0x50400000
 DMA_BASE        = 0x50000000
 DMA_CHAN_WIDTH  = 0x40
 DMA_CHAN_COUNT  = 12
@@ -15,26 +16,26 @@ DMA_SIZE_BYTE = 0x0
 DMA_SIZE_HALFWORD = 0x1
 DMA_SIZE_WORD = 0x2
 
-# DMA: RP2040 datasheet 2.5.7
+# RP2350 DMA CTRL_TRIG bit positions
 DMA_CTRL_TRIG_FIELDS = {
     "AHB_ERROR":   31<<BF_POS | 1<<BF_LEN | BFUINT32,
     "READ_ERROR":  30<<BF_POS | 1<<BF_LEN | BFUINT32,
     "WRITE_ERROR": 29<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "BUSY":        24<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "BUSY":        26<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "SNIFF_EN":    23<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "SNIFF_EN":    25<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "BSWAP":       22<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "BSWAP":       24<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "IRQ_QUIET":   21<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "IRQ_QUIET":   23<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "TREQ_SEL":    15<<BF_POS | 6<<BF_LEN | BFUINT32,
+    "TREQ_SEL":    17<<BF_POS | 6<<BF_LEN | BFUINT32,
-    "CHAIN_TO":    11<<BF_POS | 4<<BF_LEN | BFUINT32,
+    "CHAIN_TO":    13<<BF_POS | 4<<BF_LEN | BFUINT32,
-    "RING_SEL":    10<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "RING_SEL":    12<<BF_POS | 1<<BF_LEN | BFUINT32,
-    "RING_SIZE":    6<<BF_POS | 4<<BF_LEN | BFUINT32,
+    "RING_SIZE":    8<<BF_POS | 4<<BF_LEN | BFUINT32,
-    "INCR_WRITE":   5<<BF_POS | 1<<BF_LEN | BFUINT32,
+    "INCR_WRITE":   6<<BF_POS | 1<<BF_LEN | BFUINT32,
     "INCR_READ":    4<<BF_POS | 1<<BF_LEN | BFUINT32,
     "DATA_SIZE":    2<<BF_POS | 2<<BF_LEN | BFUINT32,
     "HIGH_PRIORITY":1<<BF_POS | 1<<BF_LEN | BFUINT32,
     "EN":           0<<BF_POS | 1<<BF_LEN | BFUINT32
 }
-# Channel-specific DMA registers
+
 DMA_CHAN_REGS = {
     "READ_ADDR_REG":       0x00|UINT32,
     "WRITE_ADDR_REG":      0x04|UINT32,
@@ -43,7 +44,6 @@ DMA_CHAN_REGS = {
     "CTRL_TRIG":          (0x0c, DMA_CTRL_TRIG_FIELDS)
 }
 
-# General DMA registers
 DMA_REGS = {
     "INTR":               0x400|UINT32,
     "INTE0":              0x404|UINT32,
@@ -63,35 +63,44 @@ DMA_REGS = {
     "CHAN_ABORT":         0x444|UINT32
 }
 
-DMA_CHANS = [struct(DMA_BASE + n*DMA_CHAN_WIDTH, DMA_CHAN_REGS) for n in range(0,DMA_CHAN_COUNT)]
+DMA_CHANS = [struct(DMA_BASE + n*DMA_CHAN_WIDTH, DMA_CHAN_REGS) for n in range(DMA_CHAN_COUNT)]
 DMA_DEVICE = struct(DMA_BASE, DMA_REGS)
 
-DMA_CH0_AL3_TRANS_COUNT = DMA_BASE + 0x38
+PIO_TX_FIFO_OFFSET = 0x10
+
+# RP2350 DREQ: PIO0_TX=0-3, PIO0_RX=4-7, PIO1_TX=8-11, PIO1_RX=12-15, PIO2_TX=16-19
+def _pio_base_and_treq(sm_num):
+    """Return (PIO_BASE, TREQ_SEL) for state machine 0..11."""
+    if sm_num < 4:
+        return (PIO0_BASE, sm_num)
+    if sm_num < 8:
+        return (PIO1_BASE, sm_num + 4)
+    if sm_num < 12:
+        return (PIO2_BASE, sm_num + 8)
+    raise ValueError("state machine index out of range")
 
 class PIO_DMA_Transfer():
     def __init__(self, dma_channel, sm_num, block_size, transfer_count):
         self.dma_chan = DMA_CHANS[dma_channel]
         self.channel_number = dma_channel
 
-        if (sm_num >= 0 and sm_num < 4):
+        pio_base, treq_sel = _pio_base_and_treq(sm_num)
-            self.dma_chan.WRITE_ADDR_REG = PIO0_BASE + 0x10 + sm_num *4
+        sm_offset = (sm_num % 4) * 4
-            self.dma_chan.CTRL_TRIG.TREQ_SEL = sm_num
+        self.dma_chan.WRITE_ADDR_REG = pio_base + PIO_TX_FIFO_OFFSET + sm_offset
-        elif (sm_num < 8):
+        self.dma_chan.CTRL_TRIG.TREQ_SEL = treq_sel
-            self.dma_chan.WRITE_ADDR_REG = PIO1_BASE + 0x10 + (sm_num-4) *4
-            self.dma_chan.CTRL_TRIG.TREQ_SEL = sm_num + 4
 
-        if (block_size == 8):
+        if block_size == 8:
             self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_BYTE
-        if (block_size == 16):
+        elif block_size == 16:
             self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_HALFWORD
-        if (block_size == 32):
+        elif block_size == 32:
             self.dma_chan.CTRL_TRIG.DATA_SIZE = DMA_SIZE_WORD
 
         self.dma_chan.TRANS_COUNT_REG = transfer_count
 
-        #Do I just always want these?
         self.dma_chan.CTRL_TRIG.INCR_WRITE = 0
         self.dma_chan.CTRL_TRIG.INCR_READ = 1
+        self.dma_chan.CTRL_TRIG.CHAIN_TO = dma_channel
 
     def start_transfer(self, buffer):
         self.dma_chan.READ_ADDR_REG = uctypes.addressof(buffer)
@@ -101,17 +110,4 @@ class PIO_DMA_Transfer():
         return self.dma_chan.TRANS_COUNT_REG
 
     def busy(self):
-        if self.dma_chan.CTRL_TRIG.DATA_SIZE == 1:
+        return bool(self.dma_chan.CTRL_TRIG_REG & (1 << 26))
-            return True
-        else:
-            return False
-        
-
-        
-
-
-
-
-
-
-