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):

49
pico/lib/ws2812.py
View File

@@ -20,43 +20,17 @@ def ws2812():
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)
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)
def __init__(self, num_leds, pin, state_machine, brightness=0.1):
self.sm = rp2.StateMachine(state_machine, ws2812, freq=8_000_000, sideset_base=Pin(pin)) self.sm = rp2.StateMachine(state_machine, ws2812, freq=8_000_000, sideset_base=Pin(pin))
self.sm.active(1) self.sm.active(1)
self.ar = bytearray(num_leds*3) self.ar = bytearray(num_leds*3)
self.num_leds = num_leds self.num_leds = num_leds
self.brightness = brightness self.brightness = brightness
self.pio_dma = dma.PIO_DMA_Transfer(state_machine, state_machine, 8, num_leds * 3) self.invert = invert
# Pre-built bytearrays, one per color (GRB, brightness applied) for fast show self.pio_dma = dma.PIO_DMA_Transfer(state_machine+4, state_machine, 8, num_leds*3)
self.color_buffers = [self._color_to_buffer(c) for c in self.COLORS]
def _color_to_buffer(self, color): def show(self):
"""One bytearray of length num_leds*3, all pixels same color (GRB).""" self.pio_dma.start_transfer(self.ar)
r, g, b = color[0], color[1], color[2]
g = int(g * self.brightness) & 0xFF
r = int(r * self.brightness) & 0xFF
b = int(b * self.brightness) & 0xFF
return bytearray([g, r, b] * self.num_leds)
def show(self, buffer=None, offset=0):
"""Push buffer to PIO via DMA. If buffer is None, use self.ar (offset must be 0).
With offset, DMA reads directly from buffer[offset:offset+num_leds*3]; no copy."""
buf = buffer if buffer is not None else self.ar
self.pio_dma.start_transfer(buf, offset)
def show_color(self, color_index):
"""Show pre-built buffer for COLORS[color_index]. No fill() needed."""
self.show(self.color_buffers[color_index])
def set(self, i, color): def set(self, i, color):
self.ar[i*3] = int(color[1]*self.brightness) self.ar[i*3] = int(color[1]*self.brightness)
@@ -70,8 +44,18 @@ class WS2812B:
def busy(self): def busy(self):
return self.pio_dma.busy() 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__": if __name__ == "__main__":
num_leds, pin, sm, brightness = 10, 2, 0, 1 num_leds, pin, sm, brightness = 293, 2, 0, 0.1
ws0 = WS2812B(num_leds, pin, sm, brightness) ws0 = WS2812B(num_leds, pin, sm, brightness)
while True: while True:
for color in ws0.COLORS: for color in ws0.COLORS:
@@ -81,3 +65,4 @@ if __name__ == "__main__":