Add n values; remove color1, color2

.gitignore

@@ -1,2 +1,3 @@
 settings.json
 .venv
+__pycache__

src/main.py

@@ -17,15 +17,7 @@ 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.colors = [(8,0,0)]
-    patterns.set_color2(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(0)
 
     async def system():
         while True:
@@ -42,9 +34,10 @@ async def main():
     wdt = machine.WDT(timeout=10000)
     wdt.feed()
 
-    asyncio.create_task(tick())
     asyncio.create_task(p2p(settings, patterns))
     asyncio.create_task(system())
+    patterns.select(settings["pattern"])
+    await patterns.run()
 
 
 

src/p2p.py

@@ -11,10 +11,6 @@ async def p2p(settings, patterns):
         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):
+            await settings.set_settings(data.get("settings", {}), patterns, data.get("save", False))
-                patterns.set_pattern_step(settings["step"])
-            else:
-                settings.set_settings(data.get("settings", {}), patterns, data.get("save", False))
-    print("should not print")

src/patterns.py

@@ -37,6 +37,7 @@ class Patterns(PatternsBase):
             "rainbow": self.rainbow,
             "pulse": self.pulse,
             "transition": self.transition,
+            "n_chase": self.n_chase,
         }
 
 
@@ -78,7 +79,7 @@ class Patterns(PatternsBase):
             return
         
         # Auto is True: run continuously
-        sleep_ms = max(1, int(self.delay / 5))
+        sleep_ms = max(1, int(self.delay))
         last_update = utime.ticks_ms()
         
         while self.running:
@@ -100,10 +101,10 @@ class Patterns(PatternsBase):
         self.running = True
         self.off()
         
-        # Get timing parameters with defaults if not set
+        # Get timing parameters, ensure non-negative
-        attack_ms = getattr(self, 'n1', 200)  # Attack time in ms
+        attack_ms = max(0, int(self.n1))  # Attack time in ms
-        hold_ms = getattr(self, 'n2', 200)    # Hold time in ms
+        hold_ms = max(0, int(self.n2))    # Hold time in ms
-        decay_ms = getattr(self, 'n3', 200)   # Decay time in ms
+        decay_ms = max(0, int(self.n3))   # Decay time in ms
         
         # Ensure we have at least one color
         if not self.colors:
@@ -271,3 +272,69 @@ class Patterns(PatternsBase):
         
         self.running = False
         self.stopped = True
+
+    def n_chase(self):
+        """N-chase pattern: n1 LEDs of color0, n2 LEDs of color1, repeating.
+        Moves by n3 on even steps, n4 on odd steps (n3/n4 can be positive or negative)"""
+        self.stopped = False
+        self.running = True
+        
+        if len(self.colors) < 2:
+            # Need at least 2 colors
+            self.running = False
+            self.stopped = True
+            return
+        
+        n1 = max(1, int(self.n1))  # LEDs of color 0
+        n2 = max(1, int(self.n2))  # LEDs of color 1
+        n3 = int(self.n3)  # Step movement on odd steps (can be negative)
+        n4 = int(self.n4)  # Step movement on even steps (can be negative)
+        
+        segment_length = n1 + n2
+        position = 0  # Current position offset
+        step_count = 0  # Track which step we're on
+        
+        color0 = self.apply_brightness(self.colors[0])
+        color1 = self.apply_brightness(self.colors[1])
+        
+        transition_duration = max(10, self.delay)
+        last_update = utime.ticks_ms()
+        
+        while self.running:
+            current_time = utime.ticks_ms()
+            if utime.ticks_diff(current_time, last_update) >= transition_duration:
+                # Clear all LEDs
+                self.n.fill((0, 0, 0))
+                
+                # Draw repeating pattern starting at position
+                for i in range(self.num_leds):
+                    # Calculate position in the repeating segment
+                    relative_pos = (i - position) % segment_length
+                    if relative_pos < 0:
+                        relative_pos = (relative_pos + segment_length) % segment_length
+                    
+                    # Determine which color based on position in segment
+                    if relative_pos < n1:
+                        self.n[i] = color0
+                    else:
+                        self.n[i] = color1
+                
+                self.n.write()
+                
+                # Move position by n3 or n4 on alternate steps
+                if step_count % 2 == 0:
+                    position = position + n3
+                else:
+                    position = position + n4
+                
+                # Wrap position to keep it reasonable
+                max_pos = self.num_leds + segment_length
+                position = position % max_pos
+                if position < 0:
+                    position += max_pos
+                
+                step_count += 1
+                last_update = current_time
+        
+        self.running = False
+        self.stopped = True

src/patterns_base.py

@@ -4,6 +4,8 @@ import utime
 import random
 import _thread
 import asyncio
+import json
+from presets import Presets
 
 # Short-key parameter mapping for convenience setters
 param_mapping = {
@@ -53,8 +55,16 @@ class Patterns:
         self.scanner_tail_length = 3 # Number of trailing pixels
         self.running = False
         self.stopped = True
+        self.presets = Presets()
+        self.n1 = 0
+        self.n2 = 0
+        self.n3 = 0
+        self.n4 = 0
+        self.n5 = 0
+        self.n6 = 0                
 
     def select(self, pattern):
+
         if pattern in self.patterns:
             self.selected = pattern
             return True

src/settings.py

@@ -45,31 +45,40 @@ class Settings(dict):
             self.set_defaults()
             self.save()
 
-    def set_settings(self, data, patterns, save):
+    async def set_settings(self, data, patterns, save):
         try:
-            print(data)
+            print(f"Setting settings: {data}")
             for key, value in data.items():
                 print(key, value)
                 if key == "colors":
                     buff = []
                     for color in value:
                         buff.append(tuple(int(color[i:i+2], 16) for i in self.color_order))
-                    patterns.set_colors(buff)
+                    patterns.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
-                elif key == "color2":
-                    patterns.set_color2(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):
                         return "Pattern doesn't exist", 400
+                    await patterns.run()
                 elif key == "delay":
                     delay = int(data["delay"])
-                    patterns.set_delay(delay)
+                    patterns.delay = delay
                 elif key == "brightness":
                     brightness = int(data["brightness"])
-                    patterns.set_brightness(brightness)
+                    patterns.brightness = brightness
+                elif key == "n1":
+                    patterns.n1 = value
+                elif key == "n2":
+                    patterns.n2 = value
+                elif key == "n3":
+                    patterns.n3 = value
+                elif key == "n4":
+                    patterns.n4 = value
+                elif key == "n5":
+                    patterns.n5 = value
+                elif key == "n6":
+                    patterns.n6 = value
                 elif key == "name":
                     self[key] = value
                     self.save()
@@ -86,9 +95,9 @@ class Settings(dict):
                     return "Invalid key", 400
                 self[key] = value
             #print(self)
-            patterns.sync()
             if save:
                 self.save()
+            print(self)
             return "OK", 200
         except (KeyError, ValueError):
             return "Bad request", 400

test/patterns.py

@@ -1,45 +1,55 @@
 #!/usr/bin/env python3
-import utime
+import uasyncio as asyncio
 from machine import WDT
 from settings import Settings
 from patterns import Patterns
 
 
-def run():
+async def main():
     s = Settings()
     pin = s.get("led_pin", 10)
     num = s.get("num_leds", 30)
 
     p = Patterns(pin=pin, num_leds=num)
-    wdt = WDT(timeout=10000)
+    p.load()
+    print(p)
+    p.save()
+    # print(p)
 
-    # Baseline params
-    p.set_param("br", 64)
-    p.set_param("dl", 500)
-    p.set_param("cl", [(255, 0, 0), (0, 0, 255)])
-    p.set_param("n1", 200)
-    p.set_param("n2", 200)
-    p.set_param("n3", 1)
-    p.set_param("n4", 1)
 
-    for name, fn in p.patterns.items():
+    # wdt = WDT(timeout=10000)
-        if fn is None:
-            continue
-        print(name)
-        p.set_param("pt", name)
 
-        start = utime.ticks_ms()
+    # # Baseline params
-        while utime.ticks_diff(utime.ticks_ms(), start) < 2000:
+    # p.set_param("br", 64)
-            p.tick()
+    # p.set_param("dl", 500)
-            wdt.feed()
+    # p.set_param("cl", [(255, 0, 0), (0, 0, 255)])
-            utime.sleep_ms(10)
+    # p.set_param("n1", 200)
+    # p.set_param("n2", 200)
+    # p.set_param("n3", 1)
+    # p.set_param("n4", 1)
 
-    p.set_param("pt", "off")
+    # for name, fn in p.patterns.items():
-    p.tick()
+    #     if fn is None:
-    utime.sleep_ms(200)
+    #         continue
+    #     print(name)
+    #     p.set_param("pt", name)
+    #     task = asyncio.create_task(p.run())
+    #     end = asyncio.get_event_loop().time() + 2.0
+    #     while asyncio.get_event_loop().time() < end:
+    #         wdt.feed()
+    #         await asyncio.sleep_ms(10)
+    #     p.stopped = True
+    #     await task
+    #     p.stopped = False
+
+    # p.set_param("pt", "off")
+    # task = asyncio.create_task(p.run())
+    # await asyncio.sleep_ms(200)
+    # p.stopped = True
+    # await task
 
 
 if __name__ == "__main__":
-    run()
+    asyncio.run(main())
 
 

test/patterns/n_chase.py

@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+import uasyncio as asyncio
+import utime
+from machine import WDT
+from settings import Settings
+from patterns import Patterns
+
+
+async def main():
+    s = Settings()
+    pin = s.get("led_pin", 10)
+    num = s.get("num_leds", 30)
+
+    p = Patterns(pin=pin, num_leds=num)
+    wdt = WDT(timeout=10000)
+    
+    # Test 1: Basic n_chase (n1=5, n2=5, n3=1, n4=1)
+    print("Test 1: Basic n_chase (n1=5, n2=5, n3=1, n4=1)")
+    p.set_param("br", 255)
+    p.set_param("dl", 200)
+    p.set_param("n1", 5)  # 5 LEDs color0
+    p.set_param("n2", 5)  # 5 LEDs color1
+    p.set_param("n3", 1)  # Move 1 forward on even steps
+    p.set_param("n4", 1)  # Move 1 forward on odd steps
+    p.set_param("cl", [(255, 0, 0), (0, 255, 0)])  # Red and Green
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Test 2: Forward and backward (n3=2, n4=-1)
+    print("Test 2: Forward and backward (n3=2, n4=-1)")
+    p.stopped = False
+    p.set_param("n1", 3)
+    p.set_param("n2", 3)
+    p.set_param("n3", 2)   # Move 2 forward on even steps
+    p.set_param("n4", -1)  # Move 1 backward on odd steps
+    p.set_param("dl", 150)
+    p.set_param("cl", [(0, 0, 255), (255, 255, 0)])  # Blue and Yellow
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Test 3: Large segments (n1=10, n2=5)
+    print("Test 3: Large segments (n1=10, n2=5, n3=3, n4=3)")
+    p.stopped = False
+    p.set_param("n1", 10)  # 10 LEDs color0
+    p.set_param("n2", 5)   # 5 LEDs color1
+    p.set_param("n3", 3)   # Move 3 forward
+    p.set_param("n4", 3)   # Move 3 forward
+    p.set_param("dl", 200)
+    p.set_param("cl", [(255, 128, 0), (128, 0, 255)])  # Orange and Purple
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Test 4: Fast movement (n3=5, n4=5)
+    print("Test 4: Fast movement (n3=5, n4=5)")
+    p.stopped = False
+    p.set_param("n1", 4)
+    p.set_param("n2", 4)
+    p.set_param("n3", 5)   # Move 5 forward
+    p.set_param("n4", 5)   # Move 5 forward
+    p.set_param("dl", 100)
+    p.set_param("cl", [(255, 0, 255), (0, 255, 255)])  # Magenta and Cyan
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 2000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Test 5: Backward movement (n3=-2, n4=-2)
+    print("Test 5: Backward movement (n3=-2, n4=-2)")
+    p.stopped = False
+    p.set_param("n1", 6)
+    p.set_param("n2", 4)
+    p.set_param("n3", -2)  # Move 2 backward
+    p.set_param("n4", -2)  # Move 2 backward
+    p.set_param("dl", 200)
+    p.set_param("cl", [(255, 255, 255), (0, 0, 0)])  # White and Black
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Test 6: Alternating forward/backward (n3=3, n4=-2)
+    print("Test 6: Alternating forward/backward (n3=3, n4=-2)")
+    p.stopped = False
+    p.set_param("n1", 5)
+    p.set_param("n2", 5)
+    p.set_param("n3", 3)   # Move 3 forward on even steps
+    p.set_param("n4", -2) # Move 2 backward on odd steps
+    p.set_param("dl", 250)
+    p.set_param("cl", [(255, 0, 0), (0, 255, 0)])  # Red and Green
+    p.select("n_chase")
+    task = asyncio.create_task(p.run())
+    start = utime.ticks_ms()
+    while utime.ticks_diff(utime.ticks_ms(), start) < 4000:
+        wdt.feed()
+        await asyncio.sleep_ms(10)
+    await p.stop()
+    await task
+    
+    # Cleanup
+    print("Test complete, turning off")
+    p.stopped = False
+    p.select("off")
+    task = asyncio.create_task(p.run())
+    await asyncio.sleep_ms(100)
+    await p.stop()
+    await task
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
+
+

test/test_patterns_save_load.py

@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+"""
+Test for saving and loading patterns
+Run with: mpremote run test/test_patterns_save_load.py
+"""
+
+import json
+import uasyncio as asyncio
+from settings import Settings
+from patterns import Patterns
+
+
+async def test_patterns_save_load():
+    """Test saving and loading patterns"""
+    print("Testing patterns save and load functionality...")
+    
+    # Test 1: Initialize patterns and check initial state
+    print("\nTest 1: Initialize patterns")
+    s = Settings()
+    pin = s.get("led_pin", 10)
+    num_leds = s.get("num_leds", 30)
+    
+    p1 = Patterns(pin=pin, num_leds=num_leds)
+    print(f"Initial patterns count: {len(p1.patterns)}")
+    print(f"Available patterns: {list(p1.patterns.keys())}")
+    print(f"Selected pattern: {p1.selected}")
+    
+    # Test 2: Try to save patterns (will fail because patterns contain functions)
+    print("\nTest 2: Attempt to save patterns")
+    try:
+        result = p1.save()
+        if result:
+            print("✓ Patterns saved successfully")
+        else:
+            print("✗ Patterns save failed (expected - patterns contain functions)")
+    except Exception as e:
+        print(f"✗ Exception during save: {e}")
+    
+    # Test 3: Try to load patterns
+    print("\nTest 3: Attempt to load patterns")
+    try:
+        result = p1.load()
+        if result:
+            print("✓ Patterns loaded successfully")
+            print(f"Patterns after load: {list(p1.patterns.keys())}")
+        else:
+            print("✗ Patterns load failed")
+    except Exception as e:
+        print(f"✗ Exception during load: {e}")
+    
+    # Test 4: Test with empty patterns dict (simulating custom patterns)
+    print("\nTest 4: Test save/load with empty patterns dict")
+    p2 = Patterns(pin=pin, num_leds=num_leds)
+    # Store original patterns
+    original_patterns = p2.patterns.copy()
+    # Clear patterns to test save/load with empty dict
+    p2.patterns = {}
+    
+    try:
+        result = p2.save()
+        if result:
+            print("✓ Empty patterns dict saved successfully")
+        else:
+            print("✗ Failed to save empty patterns dict")
+    except Exception as e:
+        print(f"✗ Exception saving empty patterns: {e}")
+    
+    # Try to load
+    p3 = Patterns(pin=pin, num_leds=num_leds)
+    p3.patterns = {}  # Start with empty
+    try:
+        result = p3.load()
+        if result:
+            print("✓ Patterns loaded successfully")
+            print(f"Patterns count after load: {len(p3.patterns)}")
+        else:
+            print("✗ Failed to load patterns")
+    except Exception as e:
+        print(f"✗ Exception loading patterns: {e}")
+    
+    # Restore original patterns
+    p2.patterns = original_patterns
+    p3.patterns = original_patterns
+    
+    # Test 5: Verify patterns object state
+    print("\nTest 5: Verify patterns object state")
+    print(f"Patterns object type: {type(p1)}")
+    print(f"Has save method: {hasattr(p1, 'save')}")
+    print(f"Has load method: {hasattr(p1, 'load')}")
+    print(f"PATTERNS_FILE: {p1.PATTERNS_FILE}")
+    
+    # Test 6: Test pattern selection persists
+    print("\nTest 6: Test pattern selection")
+    test_pattern = "rainbow"
+    if test_pattern in p1.patterns:
+        p1.select(test_pattern)
+        print(f"Selected pattern: {p1.selected}")
+        if p1.selected == test_pattern:
+            print("✓ Pattern selection works")
+        else:
+            print(f"✗ Pattern selection failed. Expected '{test_pattern}', got '{p1.selected}'")
+    else:
+        print(f"Pattern '{test_pattern}' not available")
+    
+    print("\n=== Patterns Save/Load test complete ===")
+
+
+if __name__ == "__main__":
+    asyncio.run(test_patterns_save_load())
+

test/test_save_load.py

@@ -0,0 +1,111 @@
+#!/usr/bin/env python3
+"""
+Test for saving and loading settings
+Run with: mpremote run test/test_save_load.py
+"""
+
+import json
+import os
+from settings import Settings
+from patterns import Patterns
+
+
+def test_save_load():
+    """Test saving and loading settings"""
+    print("Testing save and load functionality...")
+    
+    # Test 1: Save settings
+    print("\nTest 1: Save settings")
+    settings1 = Settings()
+    
+    # Modify some settings
+    original_num_leds = settings1.get("num_leds", 50)
+    original_pattern = settings1.get("pattern", "off")
+    original_brightness = settings1.get("brightness", 127)
+    
+    settings1["num_leds"] = 100
+    settings1["pattern"] = "rainbow"
+    settings1["brightness"] = 200
+    settings1["delay"] = 150
+    settings1["color1"] = "#ff0000"
+    settings1["color2"] = "#00ff00"
+    
+    print(f"Original num_leds: {original_num_leds}")
+    print(f"Setting num_leds to: {settings1['num_leds']}")
+    print(f"Setting pattern to: {settings1['pattern']}")
+    print(f"Setting brightness to: {settings1['brightness']}")
+    
+    # Save settings
+    settings1.save()
+    print("Settings saved")
+    
+    # Test 2: Load settings
+    print("\nTest 2: Load settings")
+    settings2 = Settings()
+    
+    # Verify loaded values
+    print(f"Loaded num_leds: {settings2['num_leds']}")
+    print(f"Loaded pattern: {settings2['pattern']}")
+    print(f"Loaded brightness: {settings2['brightness']}")
+    print(f"Loaded delay: {settings2.get('delay', 'not set')}")
+    print(f"Loaded color1: {settings2.get('color1', 'not set')}")
+    print(f"Loaded color2: {settings2.get('color2', 'not set')}")
+    
+    # Verify values match
+    if settings2["num_leds"] == 100:
+        print("✓ num_leds saved and loaded correctly")
+    else:
+        print(f"✗ num_leds mismatch! Expected 100, got {settings2['num_leds']}")
+    
+    if settings2["pattern"] == "rainbow":
+        print("✓ pattern saved and loaded correctly")
+    else:
+        print(f"✗ pattern mismatch! Expected 'rainbow', got '{settings2['pattern']}'")
+    
+    if settings2["brightness"] == 200:
+        print("✓ brightness saved and loaded correctly")
+    else:
+        print(f"✗ brightness mismatch! Expected 200, got {settings2['brightness']}")
+    
+    # Test 3: Test with patterns
+    print("\nTest 3: Test pattern persistence")
+    pin = settings2.get("led_pin", 10)
+    num_leds = settings2["num_leds"]
+    
+    patterns = Patterns(pin=pin, num_leds=num_leds, selected=settings2["pattern"])
+    patterns.set_brightness(settings2["brightness"])
+    patterns.set_delay(settings2["delay"])
+    
+    print(f"Pattern selected: {patterns.selected}")
+    print(f"Pattern brightness: {patterns.brightness}")
+    print(f"Pattern delay: {patterns.delay}")
+    
+    if patterns.selected == settings2["pattern"]:
+        print("✓ Pattern selection persisted")
+    else:
+        print(f"✗ Pattern mismatch! Expected '{settings2['pattern']}', got '{patterns.selected}'")
+    
+    # Test 4: Restore original settings
+    print("\nTest 4: Restore original settings")
+    settings3 = Settings()
+    settings3["num_leds"] = original_num_leds
+    settings3["pattern"] = original_pattern
+    settings3["brightness"] = original_brightness
+    settings3.save()
+    print(f"Restored num_leds to: {original_num_leds}")
+    print(f"Restored pattern to: {original_pattern}")
+    print(f"Restored brightness to: {original_brightness}")
+    
+    # Verify restoration
+    settings4 = Settings()
+    if settings4["num_leds"] == original_num_leds:
+        print("✓ Settings restored correctly")
+    else:
+        print(f"✗ Restoration failed! Expected {original_num_leds}, got {settings4['num_leds']}")
+    
+    print("\n=== Save/Load test complete ===")
+
+
+if __name__ == "__main__":
+    test_save_load()
+