Switch to async patterns

src/main.py

@@ -9,6 +9,7 @@ import machine
 import time
 import wifi
 import json
+from p2p import p2p
 
 async def main():
     settings = Settings()
@@ -16,39 +17,11 @@ async def main():
     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_color(0,(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_color(1,(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"]))
 
-    async def tick():
-        while True:
-            patterns.tick()
-            await asyncio.sleep_ms(1)
-
-
-    async def espnow():
-        e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
-        e.active(True)
-        async for mac, msg in e:
-            data = json.loads(msg)
-            print(data)
-            if settings["id"] in data["ids"] or settings["id"] == 0:
-                settings.set_settings(data["settings"], patterns)
-        print("should not print")
-
-    async def wifi_connect():
-        for i in range(10):
-            config = wifi.connect(settings.get("wifi_ssid", ""),
-                settings.get("wifi_password", ""),
-                settings.get("wifi_ip", ""),
-                settings.get("wifi_gateway", "")
-            )
-            if config:
-                print(config)
-                break
-            await asyncio.sleep_ms(500)
-
     w = web(settings, patterns)
     print(settings)
     # start the server in a bacakground task
@@ -57,10 +30,7 @@ async def main():
     wdt = machine.WDT(timeout=10000)
     wdt.feed()
 
-
+    asyncio.create_task(p2p(settings, patterns))
-    #asyncio.create_task(wifi_connect())
-    asyncio.create_task(tick())
-    asyncio.create_task(espnow())
 
     while True:
 

src/p2p.py

@@ -0,0 +1,20 @@
+import asyncio
+import aioespnow
+import json
+
+async def p2p(settings, patterns):
+    e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
+    e.active(True)
+    async for mac, msg in e:
+        try:
+            data = json.loads(msg)
+        except:
+            print(f"Failed to load espnow data {msg}")
+            continue
+        print(data)
+        if "names" not in data or settings.get("name") in data.get("names", []):
+            if "step" in settings and isinstance(settings["step"], int):
+                patterns.set_pattern_step(settings["step"])
+            else:
+                await settings.set_settings(data.get("settings", {}), patterns, data.get("save", False))
+    print("should not print")

src/patterns.py

@@ -1,4 +1,5 @@
-from machine import Pin
+import asyncio
+from machine import Pin, WDT
 from neopixel import NeoPixel
 import utime
 import random
@@ -7,39 +8,24 @@ class Patterns:
     def __init__(self, pin, num_leds, color1=(0,0,0), color2=(0,0,0), brightness=127, selected="rainbow_cycle", delay=100):
         self.n = NeoPixel(Pin(pin, Pin.OUT), num_leds)
         self.num_leds = num_leds
-        self.pattern_step = 0
-        self.last_update = utime.ticks_ms()
         self.delay = delay
         self.brightness = brightness
         self.patterns = {
             "off": self.off,
             "on" : self.on,
-            "color_wipe": self.color_wipe_step,
+            "blink": self.blink,
-            "rainbow_cycle": self.rainbow_cycle_step,
+            "rainbow": self.rainbow,
-            "theater_chase": self.theater_chase_step,
+            "theater chase": self.theater_chase,
-            "blink": self.blink_step,
+            "flicker": self.flicker # Added flicker pattern
-            "random_color_wipe": self.random_color_wipe_step,
+
-            "random_rainbow_cycle": self.random_rainbow_cycle_step,
-            "random_theater_chase": self.random_theater_chase_step,
-            "random_blink": self.random_blink_step,
-            "color_transition": self.color_transition_step,
-            "external": None
         }
         self.selected = selected
-        self.color1 = color1
+        # Ensure colors list always starts with at least two for robust transition handling
-        self.color2 = color2
+        self.colors = [color1, color2] if color1 != color2 else [color1, (255, 255, 255)] # Fallback if initial colors are same
-        self.transition_duration = delay * 10 # Default transition duration is 10 times the delay
+        if not self.colors: # Ensure at least one color exists
-        self.transition_step = 0
+            self.colors = [(0, 0, 0)]
-        self.current_color = self.color1
+        self.task = None
-
+        self.pattern_step = 0
-    def sync(self):
-        self.pattern_step=0
-        self.last_update = utime.ticks_ms() - self.delay
-        self.tick()
-
-    def tick(self):
-        if self.patterns[self.selected]:
-            self.patterns[self.selected]()
 
     def update_num_leds(self, pin, num_leds):
         self.n = NeoPixel(Pin(pin, Pin.OUT), num_leds)
@@ -48,215 +34,189 @@ class Patterns:
 
     def set_delay(self, delay):
         self.delay = delay
-        # Update transition duration when delay changes for color_transition pattern
-        if self.selected == "color_transition":
-             self.transition_duration = self.delay * 10 # Or some other multiplier
-
 
     def set_brightness(self, brightness):
         self.brightness = brightness
 
-    def set_color1(self, color):
+    def set_colors(self, colors):
-        self.color1 = color
+        self.colors = colors
-        if self.selected == "color_transition":
-            self.transition_step = 0
-            self.current_color = self.color1
 
-
+    def set_color(self, num, color):
-    def set_color2(self, color):
+        # Changed: More robust index check
-        self.color2 = color
+        if 0 <= num < len(self.colors):
-        if self.selected == "color_transition":
+           self.colors[num] = color
-            self.transition_step = 0
+           return True
-            self.current_color = self.color1
+        elif num == len(self.colors): # Allow setting a new color at the end
-
+            self.colors.append(color)
-
-    def apply_brightness(self, color):
-        return tuple(int(c * self.brightness / 255) for c in color)
-
-    def select(self, pattern):
-        if pattern in self.patterns:
-            self.selected = pattern
-            self.sync() # Reset pattern state when selecting a new pattern
-            if pattern == "color_transition":
-                self.transition_step = 0
-                self.current_color = self.color1
-                self.transition_duration = self.delay * 10 # Initialize transition duration
             return True
         return False
 
+    def del_color(self, num):
+        # Changed: More robust index check and using del for lists
+        if 0 <= num < len(self.colors):
+           del self.colors[num]
+           return True
+        return False
+
+    def apply_brightness(self, color, brightness_override=None):
+            effective_brightness = brightness_override if brightness_override is not None else self.brightness
+            return tuple(int(c * effective_brightness / 255) for c in color)
+
+    async def select(self, pattern, reset = True):
+        if pattern not in self.patterns:
+            return False
+        self.selected = pattern
+        if self.task is not None:
+            self.task.cancel()
+        if reset: self.pattern_step = 0
+        print(pattern)
+        self.task = asyncio.create_task(self.patterns[pattern]())
+        return True
+
     def set(self, i, color):
         self.n[i] = color
 
     def write(self):
         self.n.write()
 
-    def fill(self, color=None):
+    def fill(self, color):
-        fill_color = color if color is not None else self.color1
+        self.n.fill(color)
-        for i in range(self.num_leds):
-            self.n[i] = fill_color
         self.n.write()
 
-    def off(self):
+    async def off(self):
         self.fill((0, 0, 0))
 
-    def on(self):
+    async def on(self):
-        self.fill(self.apply_brightness(self.color1))
+        self.fill(self.apply_brightness(self.colors[0]))
 
+    def sync(self):
+        self.pattern_step = 0
 
-    def color_wipe_step(self):
+    async def rainbow(self):
-        color = self.apply_brightness(self.color1)
+        def wheel(pos):
-        current_time = utime.ticks_ms()
+            if pos < 85:
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
+                return (pos * 3, 255 - pos * 3, 0)
-            if self.pattern_step < self.num_leds:
+            elif pos < 170:
+                pos -= 85
+                return (255 - pos * 3, 0, pos * 3)
+            else:
+                pos -= 170
+                return (0, pos * 3, 255 - pos * 3)
+        last_update = utime.ticks_ms()
+        while True:
+            if utime.ticks_diff(utime.ticks_ms(), last_update) >= self.delay:
                 for i in range(self.num_leds):
-                    self.n[i] = (0, 0, 0)
+                    rc_index = (i * 256 // self.num_leds) + self.pattern_step
-                self.n[self.pattern_step] = self.apply_brightness(color)
+                    self.n[i] = self.apply_brightness(wheel(rc_index & 255))
                 self.n.write()
-                self.pattern_step += 1
+                self.pattern_step = (self.pattern_step + 1) % 256
-            else:
+                last_update += self.delay
-                self.pattern_step = 0
+                await asyncio.sleep(0)
-            self.last_update = current_time
 
-    def rainbow_cycle_step(self):
-        current_time = utime.ticks_ms()
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay/5:
-            def wheel(pos):
-                if pos < 85:
-                    return (pos * 3, 255 - pos * 3, 0)
-                elif pos < 170:
-                    pos -= 85
-                    return (255 - pos * 3, 0, pos * 3)
-                else:
-                    pos -= 170
-                    return (0, pos * 3, 255 - pos * 3)
 
-            for i in range(self.num_leds):
+    async def theater_chase(self):
-                rc_index = (i * 256 // self.num_leds) + self.pattern_step
+        last_update = utime.ticks_ms()
-                self.n[i] = self.apply_brightness(wheel(rc_index & 255))
+        while True:
-            self.n.write()
+            if utime.ticks_diff(utime.ticks_ms(), last_update) >= self.delay:
-            self.pattern_step = (self.pattern_step + 1) % 256
-            self.last_update = current_time
-
-    def theater_chase_step(self):
-        current_time = utime.ticks_ms()
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
-            for i in range(self.num_leds):
-                if (i + self.pattern_step) % 3 == 0:
-                    self.n[i] = self.apply_brightness(self.color1)
-                else:
-                    self.n[i] = (0, 0, 0)
-            self.n.write()
-            self.pattern_step = (self.pattern_step + 1) % 3
-            self.last_update = current_time
-
-    def blink_step(self):
-        current_time = utime.ticks_ms()
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
-            if self.pattern_step % 2 == 0:
-                self.fill(self.apply_brightness(self.color1))
-            else:
-                self.fill((0, 0, 0))
-            self.pattern_step = (self.pattern_step + 1) % 2
-            self.last_update = current_time
-
-    def random_color_wipe_step(self):
-        current_time = utime.ticks_ms()
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
-            color = (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255))
-            if self.pattern_step < self.num_leds:
                 for i in range(self.num_leds):
-                    self.n[i] = (0, 0, 0)
+                    if (i + self.pattern_step) % 3 == 0:
-                self.n[self.pattern_step] = self.apply_brightness(color)
+                        self.n[i] = self.apply_brightness(self.colors[0])
+                    else:
+                        self.n[i] = (0, 0, 0)
                 self.n.write()
-                self.pattern_step += 1
+                self.pattern_step = (self.pattern_step + 1) % 3
-            else:
+                last_update += self.delay
-                self.pattern_step = 0
+            await asyncio.sleep(0)
-            self.last_update = current_time
 
-    def random_rainbow_cycle_step(self):
+    async def blink(self):
-        current_time = utime.ticks_ms()
+        last_update = utime.ticks_ms()
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
+        self.pattern_step = 0
-            def wheel(pos):
+        while True:
-                if pos < 85:
+            if utime.ticks_diff(utime.ticks_ms(), last_update) >= self.delay:
-                    return (pos * 3, 255 - pos * 3, 0)
+                if self.pattern_step:
-                elif pos < 170:
+                    self.off()
-                    pos -= 85
+                    self.pattern_step = 0
-                    return (255 - pos * 3, 0, pos * 3)
                 else:
-                    pos -= 170
+                    self.on()
-                    return (0, pos * 3, 255 - pos * 3)
+                    self.pattern_step = 1
+                last_update += self.delay
+                await asyncio.sleep(0)
 
-            random_offset = random.randint(0, 255)
+    async def flicker(self):
-            for i in range(self.num_leds):
+            last_update = utime.ticks_ms()
-                rc_index = (i * 256 // self.num_leds) + self.pattern_step + random_offset
+            while True:
-                self.n[i] = self.apply_brightness(wheel(rc_index & 255))
+                if utime.ticks_diff(utime.ticks_ms(), last_update) >= self.delay:
-            self.n.write()
+                    # Calculate a single flicker amount for all LEDs
-            self.pattern_step = (self.pattern_step + 1) % 256
+                    flicker_amount = random.randint(int(-self.brightness // 1.5), int(self.brightness // 1.5))
-            self.last_update = current_time
+                    flicker_brightness = max(0, min(255, self.brightness + flicker_amount))
+                    self.fill(self.apply_brightness(self.colors[0], brightness_override=flicker_brightness))
+                    last_update += self.delay
+                await asyncio.sleep(0)
 
-    def random_theater_chase_step(self):
+    async def color_transition(self):
-        current_time = utime.ticks_ms()
+            if len(self.colors) < 2:
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay:
+                # If there's only one color or no colors, just display that color (or off)
-            color = (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255))
+                self.fill(self.apply_brightness(self.colors[0]))
-            for i in range(self.num_leds):
+                return
-                if (i + self.pattern_step) % 3 == 0:
-                    self.n[i] = self.apply_brightness(color)
-                else:
-                    self.n[i] = (0, 0, 0)
-            self.n.write()
-            self.pattern_step = (self.pattern_step + 1) % 3
-            self.last_update = current_time
 
-    def random_blink_step(self):
+            last_transition_start_time = utime.ticks_ms()
-        current_time = utime.ticks_ms()
+            current_color_index = 0
-        if utime.ticks_diff(current_time, self.last_update) >= self.delay*10:
+            transition_duration_ms = self.delay # Use self.delay as the transition time
-            color = (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255))
-            if self.pattern_step % 2 == 0:
-                self.fill(self.apply_brightness(color))
-            else:
-                self.fill((0, 0, 0))
-            self.pattern_step = (self.pattern_step + 1) % 2
-            self.last_update = current_time
 
-    def interpolate_color(self, color_a, color_b, factor):
+            while True:
-        """Interpolates between two colors."""
+                color_from = self.colors[current_color_index]
-        return tuple(int(a + (b - a) * factor) for a, b in zip(color_a, color_b))
+                color_to = self.colors[(current_color_index + 1) % len(self.colors)]
 
-    def color_transition_step(self):
+                start_time = utime.ticks_ms()
-        current_time = utime.ticks_ms()
+                elapsed_time = 0
-        # Use delay for how often to update the transition, not for the duration
-        if utime.ticks_diff(current_time, self.last_update) >= 1: # Update frequently for smooth transition
-            self.transition_step += utime.ticks_diff(current_time, self.last_update)
-            self.last_update = current_time
 
-            if self.transition_step >= self.transition_duration:
+                while elapsed_time < transition_duration_ms:
-                # Transition complete, swap colors and restart
+                    # Calculate the interpolation factor (0.0 to 1.0)
-                self.color1, self.color2 = self.color2, self.color1
+                    # Maximize to avoid division by zero if delay is 0, though a meaningful delay is expected
-                self.transition_step = 0
+                    t = min(1.0, elapsed_time / max(1, transition_duration_ms))
 
-            # Calculate the interpolation factor (0 to 1)
+                    # Interpolate each color component
-            factor = self.transition_step / self.transition_duration
+                    interpolated_color = (
+                        int(color_from[0] + (color_to[0] - color_from[0]) * t),
+                        int(color_from[1] + (color_to[1] - color_from[1]) * t),
+                        int(color_from[2] + (color_to[2] - color_from[2]) * t)
+                    )
 
-            # Get the interpolated color and apply brightness
+                    self.fill(self.apply_brightness(interpolated_color))
-            interpolated_color = self.interpolate_color(self.color1, self.color2, factor)
+                    await asyncio.sleep(0) # Update smoothly
-            self.current_color = self.apply_brightness(interpolated_color)
+                    elapsed_time = utime.ticks_diff(utime.ticks_ms(), start_time)
 
-            # Fill the LEDs with the current interpolated color
+                # Ensure the final color is set precisely after interpolation loop
-            self.fill(self.current_color)
+                self.fill(self.apply_brightness(color_to))
 
+                current_color_index = (current_color_index + 1) % len(self.colors)
+                await asyncio.sleep(0) # Yield control
+
+async def main():
+    w = WDT(timeout = 10000)
+    p = Patterns(num_leds=10, pin=10, color1=(16,16,0))
+    # p.set_delay(100)
+    # await p.select("blink")
+    # await asyncio.sleep(2)
+    # p.set_delay(10)
+    # await p.select("rainbow")
+    # await asyncio.sleep(2)
+    # p.set_delay(100)
+    # await p.select("theater chase")
+    # await asyncio.sleep(2)
+    # p.set_colors([(255, 100, 0)]) # Set a base color for flicker (e.g., orange for a candle effect)
+    # p.set_brightness(200) # Set a brighter base for flicker to allow for dimming
+    # p.set_delay(100) # Faster updates for a more convincing flicker
+    # await p.select("flicker")
+    # await asyncio.sleep(2)
+    w.feed()
+# Test the new color transition pattern
+    print("Starting color transition...")
+    p.set_colors([(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 0)]) # Red, Green, Blue, Yellow
+    p.set_delay(1000) # 1 second transition between colors
+    p.set_brightness(150)
+    await p.select("color transition")
+    await asyncio.sleep(10) # Let it run for 10 seconds
 
 if __name__ == "__main__":
-    p = Patterns(4, 180)
+    asyncio.run(main())
-    p.set_color1((255,0,0))
-    p.set_color2((0,255,0))
-    #p.set_delay(10)
-    try:
-        while True:
-            for key in p.patterns:
-                print(key)
-                p.select(key)
-                for _ in range(2000):
-                    p.tick()
-                    utime.sleep_ms(1)
-    except KeyboardInterrupt:
-        p.fill((0, 0, 0))

src/settings.py

@@ -23,10 +23,6 @@ class Settings(dict):
         self["color_order"] = "rgb"
         self["name"] = f"led-{ubinascii.hexlify(wifi.get_mac()).decode()}"
         self["ap_password"] = ""
-        self["wifi_ssid"] = ""
-        self["wifi_password"] = ""
-        self["wifi_ip"] = ""
-        self["wifi_gateway"] = ""
         self["id"] = 0
 
     def save(self):
@@ -49,19 +45,24 @@ class Settings(dict):
             self.set_defaults()
             self.save()
 
-    def set_settings(self, data, patterns):
+    async def set_settings(self, data, patterns, save):
         try:
             print(data)
             for key, value in data.items():
                 print(key, value)
-                if key == "color1":
+                if key == "colors":
-                    patterns.set_color1(tuple(int(value[i:i+2], 16) for i in self.color_order))  # Convert hex to RGB
+                    buff = []
+                    for color in value:
+                        buff.append(tuple(int(color[i:i+2], 16) for i in self.color_order))
+                    patterns.set_colors(buff)
+                elif key == "color1":
+                    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":
-                    if not patterns.select(value):
+                    if not await patterns.select(value):
                         return "Pattern doesn't exist", 400
                 elif key == "delay":
                     delay = int(data["delay"])
@@ -84,8 +85,10 @@ class Settings(dict):
                 else:
                     return "Invalid key", 400
                 self[key] = value
+            #print(self)
             patterns.sync()
-            self.save()
+            if save:
+                self.save()
             return "OK", 200
         except (KeyError, ValueError):
             return "Bad request", 400

src/web.py

@@ -35,7 +35,7 @@ def web(settings, patterns):
             if data:
 
                 # Process the received data
-                _, status_code = settings.set_settings(json.loads(data), patterns)
+                _, status_code = await settings.set_settings(json.loads(data), patterns, True)
                 #await ws.send(status_code)
             else:
                 break