Update ESPNow message handling for list-based select format

- Change select format from string to list: ["preset_name"] or ["preset_name", step]
- Support step parameter in select messages
- Update message parsing to handle new format
This commit is contained in:
2026-01-27 00:42:14 +13:00
parent 12041352db
commit 4ed1e17032

View File

@@ -3,14 +3,13 @@ from machine import WDT
from espnow import ESPNow from espnow import ESPNow
import network import network
from patterns import Patterns from patterns import Patterns
from utils import convert_and_reorder_colors
import json import json
settings = Settings() settings = Settings()
print(settings) print(settings)
patterns = Patterns(settings["led_pin"], settings["num_leds"], selected=settings["pattern"]) patterns = Patterns(settings["led_pin"], settings["num_leds"], selected=settings["pattern"])
patterns.colors = [(8,0,0)]
patterns.select("rainbow")
wdt = WDT(timeout=10000) wdt = WDT(timeout=10000)
wdt.feed() wdt.feed()
@@ -29,6 +28,19 @@ while True:
if e.any(): if e.any():
host, msg = e.recv() host, msg = e.recv()
data = json.loads(msg) data = json.loads(msg)
if settings.get("name") in data.get("names", []): if data["v"] != "1":
settings.set_settings(data.get("settings", {}), patterns, data.get("save", False)) continue
if "presets" in data:
for name, preset_data in data["presets"].items():
# Convert hex color strings to RGB tuples and reorder based on device color order
if "colors" in preset_data:
preset_data["colors"] = convert_and_reorder_colors(preset_data["colors"], settings)
patterns.edit(name, preset_data)
if settings.get("name") in data.get("select", {}):
select_list = data["select"][settings.get("name")]
# Select value is always a list: ["preset_name"] or ["preset_name", step]
if select_list:
preset_name = select_list[0]
step = select_list[1] if len(select_list) > 1 else None
patterns.select(preset_name, step=step)