feat(espnow): groups filter and v1 select list on driver
Apply group membership on RX, accept select as [preset_id, step?], and fix identify/off plus presets layout for manual beat stepping. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
1fdb2c9441
commit
a97f6c7c2c
7 files changed
+402
-41
No files matched your search
+39
-2
@@ -4,6 +4,7 @@ from preset import Preset
|
||||
from utils import convert_and_reorder_colors
|
||||
import json
|
||||
import sys
|
||||
import utime
|
||||
try:
|
||||
import uos as os
|
||||
except ImportError:
|
||||
@@ -31,6 +32,7 @@ class Presets:
|
||||
self.patterns = {
|
||||
"off": self.off,
|
||||
"on": self.on,
|
||||
"blink": self.blink,
|
||||
}
|
||||
self.patterns.update(self._load_dynamic_patterns())
|
||||
|
||||
@@ -193,6 +195,12 @@ class Presets:
|
||||
if preset_name in self.presets:
|
||||
preset = self.presets[preset_name]
|
||||
if preset.p in self.patterns:
|
||||
if preset.p == "off":
|
||||
self.generator = None
|
||||
self.step = 0
|
||||
self.fill((0, 0, 0))
|
||||
self.selected = preset_name
|
||||
return True
|
||||
# Manual single-shot patterns: if this select arrives before the main loop has
|
||||
# tick()'d the previous frame, completing it first keeps step in sync with beats.
|
||||
if (
|
||||
@@ -206,7 +214,7 @@ class Presets:
|
||||
# Set step value if explicitly provided
|
||||
if step is not None:
|
||||
self.step = step
|
||||
elif preset.p == "off" or self.selected != preset_name:
|
||||
elif self.selected != preset_name:
|
||||
self.step = 0
|
||||
self.generator = self.patterns[preset.p](preset)
|
||||
self.selected = preset_name # Store the preset name, not the object
|
||||
@@ -256,4 +264,33 @@ class Presets:
|
||||
def on(self, preset):
|
||||
colors = preset.c
|
||||
color = colors[0] if colors else (255, 255, 255)
|
||||
self.fill(self.apply_brightness(color, preset.b))
|
||||
lit = self.apply_brightness(color, preset.b)
|
||||
while True:
|
||||
self.fill(lit)
|
||||
yield
|
||||
|
||||
def blink(self, preset):
|
||||
"""Built-in blink (used by controller identify); no patterns/ deploy required."""
|
||||
colors = preset.c if preset.c else [(255, 255, 255)]
|
||||
bg_color = self.apply_brightness(preset.background_or(colors), preset.b)
|
||||
color_index = 0
|
||||
state = True
|
||||
last_update = utime.ticks_ms()
|
||||
while True:
|
||||
now = utime.ticks_ms()
|
||||
delay_ms = max(1, int(preset.d))
|
||||
if utime.ticks_diff(now, last_update) >= delay_ms:
|
||||
if state:
|
||||
base = colors[color_index % len(colors)]
|
||||
self.fill(self.apply_brightness(base, preset.b))
|
||||
color_index += 1
|
||||
else:
|
||||
self.fill(bg_color)
|
||||
state = not state
|
||||
last_update = utime.ticks_add(last_update, delay_ms)
|
||||
yield
|
||||
|
||||
|
||||
def run_tick(presets):
|
||||
"""Advance one animation frame (standalone tests / mpremote demos)."""
|
||||
presets.tick()
|
||||
Reference in new issue
Block a user