patterns: alternating uses n1 (on) and n2 (off); ensure visible ON color; return delay; phase via self.step
test: WS client sends nested {name:{...}}; add iterations and repeat-delay; include n per message; use n1/n2 for alternating
This commit is contained in:
34
src/main.py
34
src/main.py
@@ -18,13 +18,7 @@ def main():
|
||||
settings = Settings()
|
||||
print(settings)
|
||||
|
||||
patterns = Patterns(settings["led_pin"], settings["num_leds"], selected=settings["pattern"])
|
||||
if settings["color_order"] == "rbg": color_order = (1, 5, 3)
|
||||
else: color_order = (1, 3, 5)
|
||||
patterns.set_color1(tuple(int(settings["color1"][i:i+2], 16) for i in color_order))
|
||||
patterns.set_color2(tuple(int(settings["color2"][i:i+2], 16) for i in color_order))
|
||||
patterns.set_brightness(int(settings["brightness"]))
|
||||
patterns.set_delay(int(settings["delay"]))
|
||||
patterns = Patterns(settings["led_pin"], settings["num_leds"], selected="off")
|
||||
|
||||
sta_if = network.WLAN(network.STA_IF)
|
||||
sta_if.active(True)
|
||||
@@ -35,7 +29,7 @@ def main():
|
||||
wdt = machine.WDT(timeout=10000)
|
||||
wdt.feed()
|
||||
while True:
|
||||
patterns.tick()
|
||||
# patterns.tick()
|
||||
wdt.feed()
|
||||
host, msg = e.recv(0)
|
||||
if msg:
|
||||
@@ -46,19 +40,19 @@ def main():
|
||||
defaults = data.get("d", {})
|
||||
bar = data.get(settings.get("name"), {})
|
||||
|
||||
patterns.set_brightness(bar.get("brightness", defaults.get("brightness", 100)))
|
||||
patterns.set_delay(bar.get("delay", defaults.get("delay", 100)))
|
||||
colors = bar.get("colors", defaults.get("colors", ["#000000", "#000000"]))
|
||||
patterns.brightness = bar.get("brightness", defaults.get("brightness", patterns.brightness))
|
||||
patterns.delay = bar.get("delay", defaults.get("delay", patterns.delay))
|
||||
colors = bar.get("colors", defaults.get("colors", patterns.colors))
|
||||
patterns.colors = [tuple(int(color[i:i+2], 16) for i in settings.color_order) for color in colors]
|
||||
patterns.select(bar.get("pattern", defaults.get("pattern", "off")))
|
||||
patterns.n1 = bar.get("n1", defaults.get("n1", 0))
|
||||
patterns.n2 = bar.get("n2", defaults.get("n2", 58))
|
||||
patterns.on_width = bar.get("on_width", defaults.get("on_width", 1))
|
||||
patterns.off_width = bar.get("off_width", defaults.get("off_width", 2))
|
||||
patterns.oneshot = bar.get("oneshot", defaults.get("oneshot", False))
|
||||
patterns.beat = bar.get("beat", defaults.get("beat", False))
|
||||
patterns.beat_mode = bar.get("beat_mode", defaults.get("beat_mode", False))
|
||||
patterns.auto = bar.get("auto", defaults.get("auto", True))
|
||||
# patterns.select(bar.get("pattern", defaults.get("pattern", "off")))
|
||||
patterns.n1 = bar.get("n1", defaults.get("n1", patterns.n1))
|
||||
patterns.n2 = bar.get("n2", defaults.get("n2", patterns.n2))
|
||||
patterns.step = bar.get("pattern_step", defaults.get("step", patterns.step))
|
||||
selected_pattern = bar.get("pattern", defaults.get("pattern", "off"))
|
||||
if selected_pattern in patterns.patterns:
|
||||
patterns.patterns[selected_pattern]()
|
||||
else:
|
||||
print(f"Pattern {selected_pattern} not found")
|
||||
|
||||
except:
|
||||
print(f"Failed to load espnow data {msg}")
|
||||
|
Reference in New Issue
Block a user