Switch to colors list

src/main.py

@@ -25,7 +25,14 @@ async def main():
     async def tick():
         while True:
             patterns.tick()
-            await asyncio.sleep_ms(1)
+            await asyncio.sleep_ms(0)
+
+    async def system():
+        while True:
+            gc.collect()
+            for i in range(60):
+                wdt.feed()
+                await asyncio.sleep(1)
 
     w = web(settings, patterns)
     print(settings)
@@ -37,14 +44,9 @@ async def main():
 
     asyncio.create_task(tick())
     asyncio.create_task(p2p(settings, patterns))
+    asyncio.create_task(system())
 
-    while True:
 
-        #print(time.localtime())
-        gc.collect()
-        for i in range(20):
-            wdt.feed()
-            await asyncio.sleep_ms(1000)
 
     # cleanup before ending the application
     await server

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

src/templates/index.html

@@ -51,7 +51,7 @@
                     type="color"
                     id="color"
                     name="color"
-                    value="{{settings['color1']}}"
+                    value="{{settings['colors'][0]}}"
                 />
             </form>
             <form id="color2_form" method="post" action="/color2">
@@ -59,7 +59,7 @@
                     type="color"
                     id="color2"
                     name="color2"
-                    value="{{settings['color2']}}"
+                    value="{{settings['colors'][1]}}"
                 />
             </form>
         </div>