fix(presets): normalize loaded colours before pattern math

This commit is contained in:
jimmy committed 2026-03-22 00:36:53 +13:00
1 parent 4c7646b2fe
commit 8403f36a1f
4 files changed
+16 -7

No files matched your search

+12 -3
View File
@@ -2,6 +2,7 @@ from machine import Pin
from neopixel import NeoPixel
from preset import Preset
from patterns import Blink, Rainbow, Pulse, Transition, Chase, Circle
from utils import convert_and_reorder_colors
import json
@@ -35,8 +36,13 @@ class Presets:
json.dump({name: preset.to_dict() for name, preset in self.presets.items()}, f)
return True
def load(self):
"""Load presets from a file."""
def load(self, settings=None):
"""Load presets from a file.
`settings` is used to convert hex strings in `c` to RGB tuples and apply
the device's colour order (same as ESPNow receive). If omitted, RGB order
is assumed.
"""
try:
with open("presets.json", "r") as f:
data = json.load(f)
@@ -46,10 +52,13 @@ class Presets:
self.save()
return True
order = settings if settings is not None else "rgb"
self.presets = {}
for name, preset_data in data.items():
if "c" in preset_data:
preset_data["c"] = [tuple(color) for color in preset_data["c"]]
preset_data["c"] = convert_and_reorder_colors(
preset_data["c"], order
)
self.presets[name] = Preset(preset_data)
if self.presets:
print("Loaded presets:")