technicalkiwi/led-hoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to basic led driver

Browse Source
This commit is contained in:
Jimmy
2026-02-19 14:23:54 +13:00
parent bfa85c5688
commit 6b5ae78591
2 changed files with 70 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pico/lib/dma.py
View File

@@ -93,9 +93,8 @@ class PIO_DMA_Transfer():
self.dma_chan.CTRL_TRIG.INCR_WRITE = 0 self.dma_chan.CTRL_TRIG.INCR_WRITE = 0
self.dma_chan.CTRL_TRIG.INCR_READ = 1 self.dma_chan.CTRL_TRIG.INCR_READ = 1
def start_transfer(self, buffer, offset=0): def start_transfer(self, buffer):
"""Start DMA from buffer at byte offset (no copy; DMA reads from buffer + offset).""" self.dma_chan.READ_ADDR_REG = uctypes.addressof(buffer)
self.dma_chan.READ_ADDR_REG = uctypes.addressof(buffer) + offset
self.dma_chan.CTRL_TRIG.EN = 1 self.dma_chan.CTRL_TRIG.EN = 1
def transfer_count(self): def transfer_count(self):

151
pico/lib/ws2812.py
View File

@@ -1,83 +1,68 @@
import array, time import array, time
from machine import Pin from machine import Pin
import rp2 import rp2
from time import sleep from time import sleep
import dma import dma
@rp2.asm_pio(sideset_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT, autopull=True, pull_thresh=8) @rp2.asm_pio(sideset_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT, autopull=True, pull_thresh=8)
def ws2812(): def ws2812():
T1 = 2 T1 = 2
T2 = 5 T2 = 5
T3 = 3 T3 = 3
wrap_target() wrap_target()
label("bitloop") label("bitloop")
out(x, 1) .side(0) [T3 - 1] out(x, 1) .side(0) [T3 - 1]
jmp(not_x, "do_zero") .side(1) [T1 - 1] jmp(not_x, "do_zero") .side(1) [T1 - 1]
jmp("bitloop") .side(1) [T2 - 1] jmp("bitloop") .side(1) [T2 - 1]
label("do_zero") label("do_zero")
nop() .side(0) [T2 - 1] nop() .side(0) [T2 - 1]
wrap() wrap()
class WS2812B: class WS2812B:
BLACK = (0, 0, 0) def __init__(self, num_leds, pin, state_machine, brightness=0.1, invert=False):
RED = (255, 0, 0) self.sm = rp2.StateMachine(state_machine, ws2812, freq=8_000_000, sideset_base=Pin(pin))
YELLOW = (255, 150, 0) self.sm.active(1)
GREEN = (0, 255, 0) self.ar = bytearray(num_leds*3)
CYAN = (0, 255, 255) self.num_leds = num_leds
BLUE = (0, 0, 255) self.brightness = brightness
PURPLE = (180, 0, 255) self.invert = invert
WHITE = (255, 255, 255) self.pio_dma = dma.PIO_DMA_Transfer(state_machine+4, state_machine, 8, num_leds*3)
COLORS = (BLACK, RED, YELLOW, GREEN, CYAN, BLUE, PURPLE, WHITE)
def show(self):
def __init__(self, num_leds, pin, state_machine, brightness=0.1): self.pio_dma.start_transfer(self.ar)
self.sm = rp2.StateMachine(state_machine, ws2812, freq=8_000_000, sideset_base=Pin(pin))
self.sm.active(1) def set(self, i, color):
self.ar = bytearray(num_leds * 3) self.ar[i*3] = int(color[1]*self.brightness)
self.num_leds = num_leds self.ar[i*3+1] = int(color[0]*self.brightness)
self.brightness = brightness self.ar[i*3+2] = int(color[2]*self.brightness)
self.pio_dma = dma.PIO_DMA_Transfer(state_machine, state_machine, 8, num_leds * 3)
# Pre-built bytearrays, one per color (GRB, brightness applied) for fast show def fill(self, color):
self.color_buffers = [self._color_to_buffer(c) for c in self.COLORS] for i in range(self.num_leds):
self.set(i, color)
def _color_to_buffer(self, color):
"""One bytearray of length num_leds*3, all pixels same color (GRB).""" def busy(self):
r, g, b = color[0], color[1], color[2] return self.pio_dma.busy()
g = int(g * self.brightness) & 0xFF
r = int(r * self.brightness) & 0xFF BLACK = (0, 0, 0)
b = int(b * self.brightness) & 0xFF RED = (255, 0, 0)
return bytearray([g, r, b] * self.num_leds) YELLOW = (255, 150, 0)
GREEN = (0, 255, 0)
def show(self, buffer=None, offset=0): CYAN = (0, 255, 255)
"""Push buffer to PIO via DMA. If buffer is None, use self.ar (offset must be 0). BLUE = (0, 0, 255)
With offset, DMA reads directly from buffer[offset:offset+num_leds*3]; no copy.""" PURPLE = (180, 0, 255)
buf = buffer if buffer is not None else self.ar WHITE = (255, 255, 255)
self.pio_dma.start_transfer(buf, offset) COLORS = (BLACK, RED, YELLOW, GREEN, CYAN, BLUE, PURPLE, WHITE)
def show_color(self, color_index): if __name__ == "__main__":
"""Show pre-built buffer for COLORS[color_index]. No fill() needed.""" num_leds, pin, sm, brightness = 293, 2, 0, 0.1
self.show(self.color_buffers[color_index]) ws0 = WS2812B(num_leds, pin, sm, brightness)
while True:
def set(self, i, color): for color in ws0.COLORS:
self.ar[i*3] = int(color[1]*self.brightness) ws0.fill(color)
self.ar[i*3+1] = int(color[0]*self.brightness) ws0.show()
self.ar[i*3+2] = int(color[2]*self.brightness) time.sleep(1)
def fill(self, color):
for i in range(self.num_leds):
self.set(i, color)
def busy(self):
return self.pio_dma.busy()
if __name__ == "__main__":
num_leds, pin, sm, brightness = 10, 2, 0, 1
ws0 = WS2812B(num_leds, pin, sm, brightness)
while True:
for color in ws0.COLORS:
ws0.fill(color)
ws0.show()
time.sleep(1)