diff --git a/src/settings.py b/src/settings.py index ea51d03..27855ef 100644 --- a/src/settings.py +++ b/src/settings.py @@ -16,14 +16,13 @@ class Settings(dict): self["led_pin"] = 10 self["num_leds"] = 50 self["pattern"] = "on" - self["color1"] = "#00ff00" - self["color2"] = "#ff0000" self["delay"] = 100 self["brightness"] = 10 self["color_order"] = "rgb" self["name"] = f"led-{ubinascii.hexlify(wifi.get_mac()).decode()}" self["ap_password"] = "" self["id"] = 0 + self["colors"] = [("#00ff00"),("#ff0000")] def save(self): try: @@ -56,9 +55,9 @@ class Settings(dict): buff.append(tuple(int(color[i:i+2], 16) for i in self.color_order)) patterns.set_colors(buff) elif key == "color1": - patterns.set_color1(tuple(int(value[i:i+2], 16) for i in self.color_order)) # Convert hex to RGB + patterns.set_color(0, tuple(int(value[i:i+2], 16) for i in self.color_order)) # Convert hex to RGB elif key == "color2": - patterns.set_color2(tuple(int(value[i:i+2], 16) for i in self.color_order)) # Convert hex to RGB + patterns.set_color(1, tuple(int(value[i:i+2], 16) for i in self.color_order)) # Convert hex to RGB elif key == "num_leds": patterns.update_num_leds(self["led_pin"], value) elif key == "pattern": @@ -86,7 +85,7 @@ class Settings(dict): return "Invalid key", 400 self[key] = value #print(self) - patterns.sync() + # patterns.sync() if save: self.save() return "OK", 200 diff --git a/src/templates/index.html b/src/templates/index.html index 4e1a112..e3e9c9d 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -51,7 +51,7 @@ type="color" id="color" name="color" - value="{{settings['color1']}}" + value="{{settings['colors'][0]}}" />