Compare commits
16 Commits
355d113e32
...
v2
| Author | SHA1 | Date | |
|---|---|---|---|
| a17380c250 | |||
| fb51d65077 | |||
| ca80f6a3f5 | |||
| 66bfc80771 | |||
| 3855e76da1 | |||
| 3c3a2a0fb7 | |||
| 4dacd8ca38 | |||
| 3dae9363e7 | |||
| 1962638b81 | |||
| 4f413ee4ff | |||
| 2b0b83f981 | |||
| 1d82ea6a91 | |||
| f17dd302da | |||
| 846d574ad6 | |||
| f8851d2e7c | |||
| 12e242724e |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
settings.json
|
settings.json
|
||||||
.venv
|
.venv
|
||||||
|
__pycache__
|
||||||
13
src/main.py
13
src/main.py
@@ -17,15 +17,7 @@ async def main():
|
|||||||
patterns = Patterns(settings["led_pin"], settings["num_leds"], selected=settings["pattern"])
|
patterns = Patterns(settings["led_pin"], settings["num_leds"], selected=settings["pattern"])
|
||||||
if settings["color_order"] == "rbg": color_order = (1, 5, 3)
|
if settings["color_order"] == "rbg": color_order = (1, 5, 3)
|
||||||
else: color_order = (1, 3, 5)
|
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():
|
async def system():
|
||||||
while True:
|
while True:
|
||||||
@@ -42,9 +34,10 @@ async def main():
|
|||||||
wdt = machine.WDT(timeout=10000)
|
wdt = machine.WDT(timeout=10000)
|
||||||
wdt.feed()
|
wdt.feed()
|
||||||
|
|
||||||
asyncio.create_task(tick())
|
|
||||||
asyncio.create_task(p2p(settings, patterns))
|
asyncio.create_task(p2p(settings, patterns))
|
||||||
asyncio.create_task(system())
|
asyncio.create_task(system())
|
||||||
|
patterns.select(settings["pattern"])
|
||||||
|
await patterns.run()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,6 @@ async def p2p(settings, patterns):
|
|||||||
except:
|
except:
|
||||||
print(f"Failed to load espnow data {msg}")
|
print(f"Failed to load espnow data {msg}")
|
||||||
continue
|
continue
|
||||||
print(data)
|
|
||||||
if "names" not in data or settings.get("name") in data.get("names", []):
|
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")
|
|
||||||
703
src/patterns.py
703
src/patterns.py
@@ -2,416 +2,339 @@ from machine import Pin
|
|||||||
from neopixel import NeoPixel
|
from neopixel import NeoPixel
|
||||||
import utime
|
import utime
|
||||||
import random
|
import random
|
||||||
|
import _thread
|
||||||
|
import asyncio
|
||||||
|
from patterns_base import Patterns as PatternsBase
|
||||||
|
|
||||||
class Patterns:
|
# Short-key parameter mapping for convenience setters
|
||||||
|
param_mapping = {
|
||||||
|
"pt": "selected",
|
||||||
|
"pa": "selected",
|
||||||
|
"cl": "colors",
|
||||||
|
"br": "brightness",
|
||||||
|
"dl": "delay",
|
||||||
|
"nl": "num_leds",
|
||||||
|
"co": "color_order",
|
||||||
|
"lp": "led_pin",
|
||||||
|
"n1": "n1",
|
||||||
|
"n2": "n2",
|
||||||
|
"n3": "n3",
|
||||||
|
"n4": "n4",
|
||||||
|
"n5": "n5",
|
||||||
|
"n6": "n6",
|
||||||
|
"auto": "auto",
|
||||||
|
}
|
||||||
|
|
||||||
|
class Patterns(PatternsBase):
|
||||||
def __init__(self, pin, num_leds, color1=(0,0,0), color2=(0,0,0), brightness=127, selected="rainbow_cycle", delay=100):
|
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)
|
super().__init__(pin, num_leds, color1, color2, brightness, selected, delay)
|
||||||
self.num_leds = num_leds
|
self.auto = True
|
||||||
self.pattern_step = 0
|
self.step = 0
|
||||||
self.last_update = utime.ticks_ms()
|
|
||||||
self.delay = delay
|
|
||||||
self.brightness = brightness
|
|
||||||
self.patterns = {
|
self.patterns = {
|
||||||
"off": self.off,
|
"off": self.off,
|
||||||
"on" : self.on,
|
"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,
|
"pulse": self.pulse,
|
||||||
"blink": self.blink_step,
|
"transition": self.transition,
|
||||||
"color_transition": self.color_transition_step, # Added new pattern
|
"n_chase": self.n_chase,
|
||||||
"flicker": self.flicker_step,
|
|
||||||
"scanner": self.scanner_step, # New: Single direction scanner
|
|
||||||
"bidirectional_scanner": self.bidirectional_scanner_step, # New: Bidirectional scanner
|
|
||||||
"external": None,
|
|
||||||
"pulse": self.pulse
|
|
||||||
}
|
}
|
||||||
self.selected = selected
|
|
||||||
# Ensure colors list always starts with at least two for robust transition handling
|
|
||||||
self.colors = [color1, color2] if color1 != color2 else [color1, (255, 255, 255)] # Fallback if initial colors are same
|
|
||||||
if not self.colors: # Ensure at least one color exists
|
|
||||||
self.colors = [(0, 0, 0)]
|
|
||||||
|
|
||||||
self.transition_duration = delay * 50 # Default transition duration
|
|
||||||
self.hold_duration = delay * 10 # Default hold duration at each color
|
|
||||||
self.transition_step = 0 # Current step in the transition
|
|
||||||
self.current_color_idx = 0 # Index of the color currently being held/transitioned from
|
|
||||||
self.current_color = self.colors[self.current_color_idx] # The actual blended color
|
|
||||||
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Time when the current color hold started
|
|
||||||
|
|
||||||
# New attributes for scanner patterns
|
|
||||||
self.scanner_direction = 1 # 1 for forward, -1 for backward
|
|
||||||
self.scanner_tail_length = 3 # Number of trailing pixels
|
|
||||||
|
|
||||||
def sync(self):
|
|
||||||
self.pattern_step=0
|
|
||||||
self.last_update = utime.ticks_ms() - self.delay
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color_idx = 0
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold time
|
|
||||||
# Reset scanner specific variables
|
|
||||||
self.scanner_direction = 1
|
|
||||||
self.tick()
|
|
||||||
|
|
||||||
def set_pattern_step(self, step):
|
|
||||||
self.pattern_step = step
|
|
||||||
|
|
||||||
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)
|
|
||||||
self.num_leds = num_leds
|
|
||||||
self.pattern_step = 0
|
|
||||||
|
|
||||||
def set_delay(self, delay):
|
|
||||||
self.delay = delay
|
|
||||||
# Update transition duration and hold duration when delay changes
|
|
||||||
self.transition_duration = self.delay * 50
|
|
||||||
self.hold_duration = self.delay * 10
|
|
||||||
|
|
||||||
|
|
||||||
def set_brightness(self, brightness):
|
def blink(self):
|
||||||
self.brightness = brightness
|
self.stopped = False
|
||||||
|
self.running = True
|
||||||
|
state = True # True = on, False = off
|
||||||
|
last_update = utime.ticks_ms()
|
||||||
|
|
||||||
def set_color1(self, color):
|
while self.running:
|
||||||
if len(self.colors) > 0:
|
current_time = utime.ticks_ms()
|
||||||
self.colors[0] = color
|
if utime.ticks_diff(current_time, last_update) >= self.delay:
|
||||||
if self.selected == "color_transition":
|
if state:
|
||||||
# If the first color is changed, potentially reset transition
|
self.fill(self.apply_brightness(self.colors[0]))
|
||||||
# to start from this new color if we were about to transition from it
|
|
||||||
if self.current_color_idx == 0:
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color = self.colors[0]
|
|
||||||
self.hold_start_time = utime.ticks_ms()
|
|
||||||
else:
|
|
||||||
self.colors.append(color)
|
|
||||||
|
|
||||||
|
|
||||||
def set_color2(self, color):
|
|
||||||
if len(self.colors) > 1:
|
|
||||||
self.colors[1] = color
|
|
||||||
elif len(self.colors) == 1:
|
|
||||||
self.colors.append(color)
|
|
||||||
else: # List is empty
|
|
||||||
self.colors.append((0,0,0)) # Dummy color
|
|
||||||
self.colors.append(color)
|
|
||||||
|
|
||||||
|
|
||||||
def set_colors(self, colors):
|
|
||||||
if colors and len(colors) >= 2:
|
|
||||||
self.colors = colors
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.sync() # Reset transition if new color list is provided
|
|
||||||
elif colors and len(colors) == 1:
|
|
||||||
self.colors = [colors[0], (255,255,255)] # Add a default second color
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
print("Warning: 'color_transition' requires at least two colors. Adding a default second color.")
|
|
||||||
self.sync()
|
|
||||||
else:
|
|
||||||
print("Error: set_colors requires a list of at least one color.")
|
|
||||||
self.colors = [(0,0,0), (255,255,255)] # Fallback
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.sync()
|
|
||||||
|
|
||||||
def set_color(self, num, color):
|
|
||||||
# Changed: More robust index check
|
|
||||||
if 0 <= num < len(self.colors):
|
|
||||||
self.colors[num] = color
|
|
||||||
# If the changed color is part of the current or next transition,
|
|
||||||
# restart the transition for smoother updates
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
current_from_idx = self.current_color_idx
|
|
||||||
current_to_idx = (self.current_color_idx + 1) % len(self.colors)
|
|
||||||
if num == current_from_idx or num == current_to_idx:
|
|
||||||
# If we change a color involved in the current transition,
|
|
||||||
# it's best to restart the transition state for smoothness.
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color_idx = current_from_idx # Stay at the current starting color
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold
|
|
||||||
return True
|
|
||||||
elif num == len(self.colors): # Allow setting a new color at the end
|
|
||||||
self.colors.append(color)
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def add_color(self, color):
|
|
||||||
self.colors.append(color)
|
|
||||||
if self.selected == "color_transition" and len(self.colors) == 2:
|
|
||||||
# If we just added the second color needed for transition
|
|
||||||
self.sync()
|
|
||||||
|
|
||||||
|
|
||||||
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]
|
|
||||||
# If the color being deleted was part of the current transition,
|
|
||||||
# re-evaluate the current_color_idx
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
if len(self.colors) < 2: # Need at least two colors for transition
|
|
||||||
print("Warning: Not enough colors for 'color_transition'. Switching to 'on'.")
|
|
||||||
self.select("on") # Or some other default
|
|
||||||
else:
|
|
||||||
# Adjust index if it's out of bounds after deletion or was the one transitioning from
|
|
||||||
self.current_color_idx %= len(self.colors)
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms()
|
|
||||||
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)
|
|
||||||
|
|
||||||
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":
|
|
||||||
if len(self.colors) < 2:
|
|
||||||
print("Warning: 'color_transition' requires at least two colors. Switching to 'on'.")
|
|
||||||
self.selected = "on" # Fallback if not enough colors
|
|
||||||
self.sync() # Re-sync for the new pattern
|
|
||||||
else:
|
else:
|
||||||
self.transition_step = 0
|
self.fill((0, 0, 0))
|
||||||
self.current_color_idx = 0 # Start from the first color in the list
|
state = not state
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
last_update = current_time
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold timer
|
self.running = False
|
||||||
self.transition_duration = self.delay * 50 # Initialize transition duration
|
self.stopped = True
|
||||||
self.hold_duration = self.delay * 10 # Initialize hold duration
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def set(self, i, color):
|
|
||||||
self.n[i] = color
|
|
||||||
|
|
||||||
def write(self):
|
def rainbow(self):
|
||||||
self.n.write()
|
self.stopped = False
|
||||||
|
self.running = True
|
||||||
def fill(self, color=None):
|
step = self.step % 256
|
||||||
fill_color = color if color is not None else self.colors[0]
|
step_amount = max(1, int(self.n1)) # n1 controls step increment
|
||||||
for i in range(self.num_leds):
|
|
||||||
self.n[i] = fill_color
|
|
||||||
self.n.write()
|
|
||||||
|
|
||||||
def off(self):
|
|
||||||
self.fill((0, 0, 0))
|
|
||||||
|
|
||||||
def on(self):
|
|
||||||
self.fill(self.apply_brightness(self.colors[0]))
|
|
||||||
|
|
||||||
def color_wipe_step(self):
|
|
||||||
color = self.apply_brightness(self.colors[0])
|
|
||||||
current_time = utime.ticks_ms()
|
|
||||||
if utime.ticks_diff(current_time, self.last_update) >= self.delay:
|
|
||||||
if self.pattern_step < self.num_leds:
|
|
||||||
for i in range(self.num_leds):
|
|
||||||
self.n[i] = (0, 0, 0)
|
|
||||||
self.n[self.pattern_step] = self.apply_brightness(color)
|
|
||||||
self.n.write()
|
|
||||||
self.pattern_step += 1
|
|
||||||
else:
|
|
||||||
self.pattern_step = 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)
|
|
||||||
|
|
||||||
|
# If auto is False, run once and update step
|
||||||
|
if not self.auto:
|
||||||
for i in range(self.num_leds):
|
for i in range(self.num_leds):
|
||||||
rc_index = (i * 256 // self.num_leds) + self.pattern_step
|
rc_index = (i * 256 // self.num_leds) + step
|
||||||
self.n[i] = self.apply_brightness(wheel(rc_index & 255))
|
self.n[i] = self.apply_brightness(self.wheel(rc_index & 255))
|
||||||
self.n.write()
|
self.n.write()
|
||||||
self.pattern_step = (self.pattern_step + 1) % 256
|
# Increment step by n1 for next call
|
||||||
self.last_update = current_time
|
self.step = (step + step_amount) % 256
|
||||||
|
self.running = False
|
||||||
def theater_chase_step(self):
|
self.stopped = True
|
||||||
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.colors[0])
|
|
||||||
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.colors[0]))
|
|
||||||
else:
|
|
||||||
self.fill((0, 0, 0))
|
|
||||||
self.pattern_step = (self.pattern_step + 1) % 2
|
|
||||||
self.last_update = current_time
|
|
||||||
|
|
||||||
def color_transition_step(self):
|
|
||||||
current_time = utime.ticks_ms()
|
|
||||||
|
|
||||||
# Check for hold duration first
|
|
||||||
if utime.ticks_diff(current_time, self.hold_start_time) < self.hold_duration:
|
|
||||||
# Still in hold phase, just display the current solid color
|
|
||||||
self.fill(self.apply_brightness(self.current_color))
|
|
||||||
self.last_update = current_time # Keep updating last_update to avoid skipping frames
|
|
||||||
return
|
return
|
||||||
|
|
||||||
# If hold duration is over, proceed with transition
|
# Auto is True: run continuously
|
||||||
if utime.ticks_diff(current_time, self.last_update) >= self.delay:
|
sleep_ms = max(1, int(self.delay))
|
||||||
num_colors = len(self.colors)
|
last_update = utime.ticks_ms()
|
||||||
if num_colors < 2:
|
|
||||||
# Should not happen if select handles it, but as a safeguard
|
|
||||||
self.select("on")
|
|
||||||
return
|
|
||||||
|
|
||||||
from_color = self.colors[self.current_color_idx]
|
while self.running:
|
||||||
to_color_idx = (self.current_color_idx + 1) % num_colors
|
current_time = utime.ticks_ms()
|
||||||
to_color = self.colors[to_color_idx]
|
if utime.ticks_diff(current_time, last_update) >= sleep_ms:
|
||||||
|
for i in range(self.num_leds):
|
||||||
|
rc_index = (i * 256 // self.num_leds) + step
|
||||||
|
self.n[i] = self.apply_brightness(self.wheel(rc_index & 255))
|
||||||
|
self.n.write()
|
||||||
|
step = (step + step_amount) % 256
|
||||||
|
self.step = step
|
||||||
|
last_update = current_time
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
|
||||||
# Calculate interpolation factor (0.0 to 1.0)
|
|
||||||
# transition_step goes from 0 to transition_duration - 1
|
|
||||||
if self.transition_duration > 0:
|
|
||||||
interp_factor = self.transition_step / self.transition_duration
|
|
||||||
else:
|
|
||||||
interp_factor = 1.0 # Immediately transition if duration is zero
|
|
||||||
|
|
||||||
# Interpolate each color component
|
|
||||||
r = int(from_color[0] + (to_color[0] - from_color[0]) * interp_factor)
|
|
||||||
g = int(from_color[1] + (to_color[1] - from_color[1]) * interp_factor)
|
|
||||||
b = int(from_color[2] + (to_color[2] - from_color[2]) * interp_factor)
|
|
||||||
|
|
||||||
self.current_color = (r, g, b)
|
|
||||||
self.fill(self.apply_brightness(self.current_color))
|
|
||||||
|
|
||||||
self.transition_step += self.delay # Advance the transition step by the delay
|
|
||||||
|
|
||||||
if self.transition_step >= self.transition_duration:
|
|
||||||
# Transition complete, move to the next color and reset for hold phase
|
|
||||||
self.current_color_idx = to_color_idx
|
|
||||||
self.current_color = self.colors[self.current_color_idx] # Ensure current_color is the exact target color
|
|
||||||
self.transition_step = 0 # Reset transition progress
|
|
||||||
self.hold_start_time = current_time # Start hold phase for the new color
|
|
||||||
|
|
||||||
self.last_update = current_time
|
|
||||||
|
|
||||||
def flicker_step(self):
|
|
||||||
current_time = utime.ticks_ms()
|
|
||||||
if utime.ticks_diff(current_time, self.last_update) >= self.delay/5:
|
|
||||||
base_color = self.colors[0]
|
|
||||||
# Increase the range for flicker_brightness_offset
|
|
||||||
# Changed from self.brightness // 4 to self.brightness // 2 (or even self.brightness for max intensity)
|
|
||||||
flicker_brightness_offset = random.randint(-int(self.brightness // 1.5), int(self.brightness // 1.5))
|
|
||||||
flicker_brightness = max(0, min(255, self.brightness + flicker_brightness_offset))
|
|
||||||
|
|
||||||
flicker_color = self.apply_brightness(base_color, brightness_override=flicker_brightness)
|
|
||||||
self.fill(flicker_color)
|
|
||||||
self.last_update = current_time
|
|
||||||
|
|
||||||
def scanner_step(self):
|
|
||||||
"""
|
|
||||||
Mimics a 'Knight Rider' style scanner, moving in one direction.
|
|
||||||
"""
|
|
||||||
current_time = utime.ticks_ms()
|
|
||||||
if utime.ticks_diff(current_time, self.last_update) >= self.delay:
|
|
||||||
self.fill((0, 0, 0)) # Clear all LEDs
|
|
||||||
|
|
||||||
# Calculate the head and tail position
|
|
||||||
head_pos = self.pattern_step
|
|
||||||
color = self.apply_brightness(self.colors[0])
|
|
||||||
|
|
||||||
# Draw the head
|
|
||||||
if 0 <= head_pos < self.num_leds:
|
|
||||||
self.n[head_pos] = color
|
|
||||||
|
|
||||||
# Draw the trailing pixels with decreasing brightness
|
|
||||||
for i in range(1, self.scanner_tail_length + 1):
|
|
||||||
tail_pos = head_pos - i
|
|
||||||
if 0 <= tail_pos < self.num_leds:
|
|
||||||
# Calculate fading color for tail
|
|
||||||
# Example: linear fade from full brightness to off
|
|
||||||
fade_factor = 1.0 - (i / (self.scanner_tail_length + 1))
|
|
||||||
faded_color = tuple(int(c * fade_factor) for c in color)
|
|
||||||
self.n[tail_pos] = faded_color
|
|
||||||
|
|
||||||
self.n.write()
|
|
||||||
|
|
||||||
self.pattern_step += 1
|
|
||||||
if self.pattern_step >= self.num_leds + self.scanner_tail_length:
|
|
||||||
self.pattern_step = 0 # Reset to start
|
|
||||||
|
|
||||||
self.last_update = current_time
|
|
||||||
|
|
||||||
def bidirectional_scanner_step(self):
|
|
||||||
"""
|
|
||||||
Mimics a 'Knight Rider' style scanner, moving back and forth.
|
|
||||||
"""
|
|
||||||
current_time = utime.ticks_ms()
|
|
||||||
if utime.ticks_diff(current_time, self.last_update) >= self.delay/100:
|
|
||||||
self.fill((0, 0, 0)) # Clear all LEDs
|
|
||||||
|
|
||||||
color = self.apply_brightness(self.colors[0])
|
|
||||||
|
|
||||||
# Calculate the head position based on direction
|
|
||||||
head_pos = self.pattern_step
|
|
||||||
|
|
||||||
# Draw the head
|
|
||||||
if 0 <= head_pos < self.num_leds:
|
|
||||||
self.n[head_pos] = color
|
|
||||||
|
|
||||||
# Draw the trailing pixels with decreasing brightness
|
|
||||||
for i in range(1, self.scanner_tail_length + 1):
|
|
||||||
tail_pos = head_pos - (i * self.scanner_direction)
|
|
||||||
if 0 <= tail_pos < self.num_leds:
|
|
||||||
fade_factor = 1.0 - (i / (self.scanner_tail_length + 1))
|
|
||||||
faded_color = tuple(int(c * fade_factor) for c in color)
|
|
||||||
self.n[tail_pos] = faded_color
|
|
||||||
|
|
||||||
self.n.write()
|
|
||||||
|
|
||||||
self.pattern_step += self.scanner_direction
|
|
||||||
|
|
||||||
# Change direction if boundaries are reached
|
|
||||||
if self.scanner_direction == 1 and self.pattern_step >= self.num_leds:
|
|
||||||
self.scanner_direction = -1
|
|
||||||
self.pattern_step = self.num_leds - 1 # Start moving back from the last LED
|
|
||||||
elif self.scanner_direction == -1 and self.pattern_step < 0:
|
|
||||||
self.scanner_direction = 1
|
|
||||||
self.pattern_step = 0 # Start moving forward from the first LED
|
|
||||||
|
|
||||||
self.last_update = current_time
|
|
||||||
|
|
||||||
def pulse(self):
|
def pulse(self):
|
||||||
if self.pattern_step == 0:
|
self.stopped = False
|
||||||
self.fill(self.apply_brightness(self.colors[0]))
|
self.running = True
|
||||||
self.pattern_step = 1
|
self.off()
|
||||||
self.last_update = utime.ticks_ms()
|
|
||||||
if utime.ticks_diff(utime.ticks_ms(), self.last_update) > self.delay:
|
|
||||||
self.fill((0, 0, 0))
|
|
||||||
|
|
||||||
|
# Get timing parameters, ensure non-negative
|
||||||
|
attack_ms = max(0, int(self.n1)) # Attack time in ms
|
||||||
|
hold_ms = max(0, int(self.n2)) # Hold time in ms
|
||||||
|
decay_ms = max(0, int(self.n3)) # Decay time in ms
|
||||||
|
|
||||||
if __name__ == "__main__":
|
# Ensure we have at least one color
|
||||||
import time
|
if not self.colors:
|
||||||
from machine import WDT
|
self.colors = [(255, 255, 255)]
|
||||||
wdt = WDT(timeout=2000) # Enable watchdog with a 2 second timeout
|
|
||||||
p = Patterns(pin=10, num_leds=200, color1=(255,0,0), color2=(0,0,255), brightness=127, selected="bidirectional_scanner", delay=50)
|
color_index = 0
|
||||||
p.select("pulse")
|
# Calculate minimum update interval based on LED count
|
||||||
for i in range(1000):
|
# NeoPixel timing: ~30µs per LED + reset time = ~6ms for 200 LEDs
|
||||||
p.tick()
|
# Use 10ms minimum to ensure writes complete + overhead
|
||||||
wdt.feed()
|
min_write_time_ms = (self.num_leds * 30) // 1000 + 1 # Convert µs to ms, add 1ms overhead
|
||||||
time.sleep_ms(1)
|
update_interval = max(10, min_write_time_ms + 4) # At least 10ms, add margin for safety
|
||||||
|
|
||||||
|
while self.running:
|
||||||
|
cycle_start = utime.ticks_ms()
|
||||||
|
|
||||||
|
# Get the current color from the cycle
|
||||||
|
base_color = self.colors[color_index % len(self.colors)]
|
||||||
|
|
||||||
|
# Attack phase: fade from 0 to full brightness
|
||||||
|
if attack_ms > 0:
|
||||||
|
attack_start = utime.ticks_ms()
|
||||||
|
last_update = attack_start
|
||||||
|
while self.running and utime.ticks_diff(utime.ticks_ms(), attack_start) < attack_ms:
|
||||||
|
now = utime.ticks_ms()
|
||||||
|
if utime.ticks_diff(now, last_update) >= update_interval:
|
||||||
|
elapsed = utime.ticks_diff(now, attack_start)
|
||||||
|
brightness_factor = min(1.0, elapsed / attack_ms)
|
||||||
|
color = tuple(int(c * brightness_factor) for c in base_color)
|
||||||
|
self.fill(self.apply_brightness(color))
|
||||||
|
last_update = now
|
||||||
|
|
||||||
|
# Hold phase: maintain full brightness
|
||||||
|
if hold_ms > 0 and self.running:
|
||||||
|
self.fill(self.apply_brightness(base_color))
|
||||||
|
hold_start = utime.ticks_ms()
|
||||||
|
while self.running and utime.ticks_diff(utime.ticks_ms(), hold_start) < hold_ms:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Decay phase: fade from full brightness to 0
|
||||||
|
if decay_ms > 0:
|
||||||
|
decay_start = utime.ticks_ms()
|
||||||
|
last_update = decay_start
|
||||||
|
while self.running and utime.ticks_diff(utime.ticks_ms(), decay_start) < decay_ms:
|
||||||
|
now = utime.ticks_ms()
|
||||||
|
if utime.ticks_diff(now, last_update) >= update_interval:
|
||||||
|
elapsed = utime.ticks_diff(now, decay_start)
|
||||||
|
brightness_factor = max(0.0, 1.0 - (elapsed / decay_ms))
|
||||||
|
color = tuple(int(c * brightness_factor) for c in base_color)
|
||||||
|
self.fill(self.apply_brightness(color))
|
||||||
|
last_update = now
|
||||||
|
|
||||||
|
# Move to next color in the cycle
|
||||||
|
color_index += 1
|
||||||
|
|
||||||
|
# If auto flag is False, run only once and exit
|
||||||
|
if not self.auto:
|
||||||
|
break
|
||||||
|
|
||||||
|
# Ensure the cycle takes exactly delay milliseconds before restarting
|
||||||
|
if self.running:
|
||||||
|
self.off()
|
||||||
|
wait_until = utime.ticks_add(cycle_start, self.delay)
|
||||||
|
while self.running and utime.ticks_diff(wait_until, utime.ticks_ms()) > 0:
|
||||||
|
pass
|
||||||
|
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
|
||||||
|
def transition(self):
|
||||||
|
"""Transition between colors, taking delay ms between each color"""
|
||||||
|
self.stopped = False
|
||||||
|
self.running = True
|
||||||
|
|
||||||
|
if not self.colors:
|
||||||
|
# No colors, turn off
|
||||||
|
self.off()
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
return
|
||||||
|
|
||||||
|
if len(self.colors) == 1:
|
||||||
|
# Only one color, just stay that color
|
||||||
|
last_update = utime.ticks_ms()
|
||||||
|
while self.running:
|
||||||
|
current_time = utime.ticks_ms()
|
||||||
|
if utime.ticks_diff(current_time, last_update) >= 100:
|
||||||
|
self.fill(self.apply_brightness(self.colors[0]))
|
||||||
|
last_update = current_time
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
return
|
||||||
|
|
||||||
|
# If auto is False, only transition between color1 and color2
|
||||||
|
if not self.auto:
|
||||||
|
if len(self.colors) < 2:
|
||||||
|
# Need at least 2 colors for transition
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
return
|
||||||
|
|
||||||
|
transition_duration = max(10, self.delay) # At least 10ms
|
||||||
|
update_interval = max(10, transition_duration // 50) # Update every ~2% of transition
|
||||||
|
|
||||||
|
# Transition from color1 to color2
|
||||||
|
color1 = self.colors[0]
|
||||||
|
color2 = self.colors[1]
|
||||||
|
|
||||||
|
transition_start = utime.ticks_ms()
|
||||||
|
last_update = transition_start
|
||||||
|
|
||||||
|
while self.running and utime.ticks_diff(utime.ticks_ms(), transition_start) < transition_duration:
|
||||||
|
now = utime.ticks_ms()
|
||||||
|
if utime.ticks_diff(now, last_update) >= update_interval:
|
||||||
|
# Calculate interpolation factor (0.0 to 1.0)
|
||||||
|
elapsed = utime.ticks_diff(now, transition_start)
|
||||||
|
factor = min(1.0, elapsed / transition_duration)
|
||||||
|
|
||||||
|
# Interpolate between color1 and color2
|
||||||
|
interpolated = tuple(
|
||||||
|
int(color1[i] + (color2[i] - color1[i]) * factor)
|
||||||
|
for i in range(3)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply brightness and fill
|
||||||
|
self.fill(self.apply_brightness(interpolated))
|
||||||
|
last_update = now
|
||||||
|
|
||||||
|
self.running = False
|
||||||
|
self.stopped = True
|
||||||
|
return
|
||||||
|
|
||||||
|
# Auto is True: cycle through all colors continuously
|
||||||
|
color_index = 0
|
||||||
|
transition_duration = max(10, self.delay) # At least 10ms
|
||||||
|
update_interval = max(10, transition_duration // 50) # Update every ~2% of transition
|
||||||
|
|
||||||
|
while self.running:
|
||||||
|
# Get current and next color
|
||||||
|
current_color = self.colors[color_index % len(self.colors)]
|
||||||
|
next_color = self.colors[(color_index + 1) % len(self.colors)]
|
||||||
|
|
||||||
|
# Transition from current to next color
|
||||||
|
transition_start = utime.ticks_ms()
|
||||||
|
last_update = transition_start
|
||||||
|
|
||||||
|
while self.running and utime.ticks_diff(utime.ticks_ms(), transition_start) < transition_duration:
|
||||||
|
now = utime.ticks_ms()
|
||||||
|
if utime.ticks_diff(now, last_update) >= update_interval:
|
||||||
|
# Calculate interpolation factor (0.0 to 1.0)
|
||||||
|
elapsed = utime.ticks_diff(now, transition_start)
|
||||||
|
factor = min(1.0, elapsed / transition_duration)
|
||||||
|
|
||||||
|
# Interpolate between colors
|
||||||
|
interpolated = tuple(
|
||||||
|
int(current_color[i] + (next_color[i] - current_color[i]) * factor)
|
||||||
|
for i in range(3)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply brightness and fill
|
||||||
|
self.fill(self.apply_brightness(interpolated))
|
||||||
|
last_update = now
|
||||||
|
|
||||||
|
# Move to next color
|
||||||
|
color_index = (color_index + 1) % len(self.colors)
|
||||||
|
|
||||||
|
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
|
||||||
@@ -1,9 +1,32 @@
|
|||||||
from machine import Pin
|
from machine import Pin
|
||||||
from neopixel import NeoPixel
|
from neopixel import NeoPixel
|
||||||
import utime
|
import utime
|
||||||
|
import random
|
||||||
|
import _thread
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
from presets import Presets
|
||||||
|
|
||||||
|
# Short-key parameter mapping for convenience setters
|
||||||
|
param_mapping = {
|
||||||
|
"pt": "selected",
|
||||||
|
"pa": "selected",
|
||||||
|
"cl": "colors",
|
||||||
|
"br": "brightness",
|
||||||
|
"dl": "delay",
|
||||||
|
"nl": "num_leds",
|
||||||
|
"co": "color_order",
|
||||||
|
"lp": "led_pin",
|
||||||
|
"n1": "n1",
|
||||||
|
"n2": "n2",
|
||||||
|
"n3": "n3",
|
||||||
|
"n4": "n4",
|
||||||
|
"n5": "n5",
|
||||||
|
"n6": "n6",
|
||||||
|
"auto": "auto",
|
||||||
|
}
|
||||||
|
|
||||||
class PatternBase:
|
class Patterns:
|
||||||
def __init__(self, pin, num_leds, color1=(0,0,0), color2=(0,0,0), brightness=127, selected="rainbow_cycle", delay=100):
|
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.n = NeoPixel(Pin(pin, Pin.OUT), num_leds)
|
||||||
self.num_leds = num_leds
|
self.num_leds = num_leds
|
||||||
@@ -11,6 +34,7 @@ class PatternBase:
|
|||||||
self.last_update = utime.ticks_ms()
|
self.last_update = utime.ticks_ms()
|
||||||
self.delay = delay
|
self.delay = delay
|
||||||
self.brightness = brightness
|
self.brightness = brightness
|
||||||
|
self.auto = False
|
||||||
self.patterns = {}
|
self.patterns = {}
|
||||||
self.selected = selected
|
self.selected = selected
|
||||||
# Ensure colors list always starts with at least two for robust transition handling
|
# Ensure colors list always starts with at least two for robust transition handling
|
||||||
@@ -29,80 +53,52 @@ class PatternBase:
|
|||||||
# New attributes for scanner patterns
|
# New attributes for scanner patterns
|
||||||
self.scanner_direction = 1 # 1 for forward, -1 for backward
|
self.scanner_direction = 1 # 1 for forward, -1 for backward
|
||||||
self.scanner_tail_length = 3 # Number of trailing pixels
|
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 sync(self):
|
def select(self, pattern):
|
||||||
self.pattern_step=0
|
|
||||||
self.last_update = utime.ticks_ms() - self.delay
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color_idx = 0
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold time
|
|
||||||
# Reset scanner specific variables
|
|
||||||
self.scanner_direction = 1
|
|
||||||
self.tick()
|
|
||||||
|
|
||||||
def set_pattern_step(self, step):
|
if pattern in self.patterns:
|
||||||
self.pattern_step = step
|
self.selected = pattern
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
def tick(self):
|
async def run(self):
|
||||||
if self.patterns[self.selected]:
|
print(f"Stopping pattern")
|
||||||
self.patterns[self.selected]()
|
await self.stop()
|
||||||
|
self.running = True
|
||||||
|
print(f"Starting pattern {self.selected}")
|
||||||
|
if self.selected in self.patterns:
|
||||||
|
_thread.start_new_thread(self.patterns[self.selected], ())
|
||||||
|
else:
|
||||||
|
print(f"Pattern {self.selected} not found")
|
||||||
|
|
||||||
|
async def stop(self):
|
||||||
|
self.running = False
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
while not self.stopped and utime.ticks_diff(utime.ticks_ms(), start) < 1000:
|
||||||
|
await asyncio.sleep_ms(0)
|
||||||
|
self.stopped = True
|
||||||
|
|
||||||
|
def set_param(self, key, value):
|
||||||
|
if key in param_mapping:
|
||||||
|
setattr(self, param_mapping[key], value)
|
||||||
|
return True
|
||||||
|
print(f"Invalid parameter: {key}")
|
||||||
|
return False
|
||||||
|
|
||||||
def update_num_leds(self, pin, num_leds):
|
def update_num_leds(self, pin, num_leds):
|
||||||
self.n = NeoPixel(Pin(pin, Pin.OUT), num_leds)
|
self.n = NeoPixel(Pin(pin, Pin.OUT), num_leds)
|
||||||
self.num_leds = num_leds
|
self.num_leds = num_leds
|
||||||
self.pattern_step = 0
|
self.pattern_step = 0
|
||||||
|
|
||||||
def set_delay(self, delay):
|
|
||||||
self.delay = delay
|
|
||||||
# Update transition duration and hold duration when delay changes
|
|
||||||
self.transition_duration = self.delay * 50
|
|
||||||
self.hold_duration = self.delay * 10
|
|
||||||
|
|
||||||
|
|
||||||
def set_brightness(self, brightness):
|
|
||||||
self.brightness = brightness
|
|
||||||
|
|
||||||
def set_color1(self, color):
|
|
||||||
if len(self.colors) > 0:
|
|
||||||
self.colors[0] = color
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
# If the first color is changed, potentially reset transition
|
|
||||||
# to start from this new color if we were about to transition from it
|
|
||||||
if self.current_color_idx == 0:
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color = self.colors[0]
|
|
||||||
self.hold_start_time = utime.ticks_ms()
|
|
||||||
else:
|
|
||||||
self.colors.append(color)
|
|
||||||
|
|
||||||
|
|
||||||
def set_color2(self, color):
|
|
||||||
if len(self.colors) > 1:
|
|
||||||
self.colors[1] = color
|
|
||||||
elif len(self.colors) == 1:
|
|
||||||
self.colors.append(color)
|
|
||||||
else: # List is empty
|
|
||||||
self.colors.append((0,0,0)) # Dummy color
|
|
||||||
self.colors.append(color)
|
|
||||||
|
|
||||||
|
|
||||||
def set_colors(self, colors):
|
|
||||||
if colors and len(colors) >= 2:
|
|
||||||
self.colors = colors
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.sync() # Reset transition if new color list is provided
|
|
||||||
elif colors and len(colors) == 1:
|
|
||||||
self.colors = [colors[0], (255,255,255)] # Add a default second color
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
print("Warning: 'color_transition' requires at least two colors. Adding a default second color.")
|
|
||||||
self.sync()
|
|
||||||
else:
|
|
||||||
print("Error: set_colors requires a list of at least one color.")
|
|
||||||
self.colors = [(0,0,0), (255,255,255)] # Fallback
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
self.sync()
|
|
||||||
|
|
||||||
def set_color(self, num, color):
|
def set_color(self, num, color):
|
||||||
# Changed: More robust index check
|
# Changed: More robust index check
|
||||||
@@ -110,45 +106,17 @@ class PatternBase:
|
|||||||
self.colors[num] = color
|
self.colors[num] = color
|
||||||
# If the changed color is part of the current or next transition,
|
# If the changed color is part of the current or next transition,
|
||||||
# restart the transition for smoother updates
|
# restart the transition for smoother updates
|
||||||
if self.selected == "color_transition":
|
|
||||||
current_from_idx = self.current_color_idx
|
|
||||||
current_to_idx = (self.current_color_idx + 1) % len(self.colors)
|
|
||||||
if num == current_from_idx or num == current_to_idx:
|
|
||||||
# If we change a color involved in the current transition,
|
|
||||||
# it's best to restart the transition state for smoothness.
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color_idx = current_from_idx # Stay at the current starting color
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold
|
|
||||||
return True
|
return True
|
||||||
elif num == len(self.colors): # Allow setting a new color at the end
|
elif num == len(self.colors): # Allow setting a new color at the end
|
||||||
self.colors.append(color)
|
self.colors.append(color)
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def add_color(self, color):
|
|
||||||
self.colors.append(color)
|
|
||||||
if self.selected == "color_transition" and len(self.colors) == 2:
|
|
||||||
# If we just added the second color needed for transition
|
|
||||||
self.sync()
|
|
||||||
|
|
||||||
|
|
||||||
def del_color(self, num):
|
def del_color(self, num):
|
||||||
# Changed: More robust index check and using del for lists
|
# Changed: More robust index check and using del for lists
|
||||||
if 0 <= num < len(self.colors):
|
if 0 <= num < len(self.colors):
|
||||||
del self.colors[num]
|
del self.colors[num]
|
||||||
# If the color being deleted was part of the current transition,
|
|
||||||
# re-evaluate the current_color_idx
|
|
||||||
if self.selected == "color_transition":
|
|
||||||
if len(self.colors) < 2: # Need at least two colors for transition
|
|
||||||
print("Warning: Not enough colors for 'color_transition'. Switching to 'on'.")
|
|
||||||
self.select("on") # Or some other default
|
|
||||||
else:
|
|
||||||
# Adjust index if it's out of bounds after deletion or was the one transitioning from
|
|
||||||
self.current_color_idx %= len(self.colors)
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms()
|
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -156,31 +124,6 @@ class PatternBase:
|
|||||||
effective_brightness = brightness_override if brightness_override is not None else self.brightness
|
effective_brightness = brightness_override if brightness_override is not None else self.brightness
|
||||||
return tuple(int(c * effective_brightness / 255) for c in color)
|
return tuple(int(c * effective_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":
|
|
||||||
if len(self.colors) < 2:
|
|
||||||
print("Warning: 'color_transition' requires at least two colors. Switching to 'on'.")
|
|
||||||
self.selected = "on" # Fallback if not enough colors
|
|
||||||
self.sync() # Re-sync for the new pattern
|
|
||||||
else:
|
|
||||||
self.transition_step = 0
|
|
||||||
self.current_color_idx = 0 # Start from the first color in the list
|
|
||||||
self.current_color = self.colors[self.current_color_idx]
|
|
||||||
self.hold_start_time = utime.ticks_ms() # Reset hold timer
|
|
||||||
self.transition_duration = self.delay * 50 # Initialize transition duration
|
|
||||||
self.hold_duration = self.delay * 10 # Initialize hold duration
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def set(self, i, color):
|
|
||||||
self.n[i] = color
|
|
||||||
|
|
||||||
def write(self):
|
|
||||||
self.n.write()
|
|
||||||
|
|
||||||
def fill(self, color=None):
|
def fill(self, color=None):
|
||||||
fill_color = color if color is not None else self.colors[0]
|
fill_color = color if color is not None else self.colors[0]
|
||||||
for i in range(self.num_leds):
|
for i in range(self.num_leds):
|
||||||
@@ -192,3 +135,18 @@ class PatternBase:
|
|||||||
|
|
||||||
def on(self):
|
def on(self):
|
||||||
self.fill(self.apply_brightness(self.colors[0]))
|
self.fill(self.apply_brightness(self.colors[0]))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def wheel(self, 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)
|
||||||
|
|
||||||
|
|
||||||
@@ -45,31 +45,40 @@ class Settings(dict):
|
|||||||
self.set_defaults()
|
self.set_defaults()
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
def set_settings(self, data, patterns, save):
|
async def set_settings(self, data, patterns, save):
|
||||||
try:
|
try:
|
||||||
print(data)
|
print(f"Setting settings: {data}")
|
||||||
for key, value in data.items():
|
for key, value in data.items():
|
||||||
print(key, value)
|
print(key, value)
|
||||||
if key == "colors":
|
if key == "colors":
|
||||||
buff = []
|
buff = []
|
||||||
for color in value:
|
for color in value:
|
||||||
buff.append(tuple(int(color[i:i+2], 16) for i in self.color_order))
|
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":
|
elif key == "num_leds":
|
||||||
patterns.update_num_leds(self["led_pin"], value)
|
patterns.update_num_leds(self["led_pin"], value)
|
||||||
elif key == "pattern":
|
elif key == "pattern":
|
||||||
if not patterns.select(value):
|
if not patterns.select(value):
|
||||||
return "Pattern doesn't exist", 400
|
return "Pattern doesn't exist", 400
|
||||||
|
await patterns.run()
|
||||||
elif key == "delay":
|
elif key == "delay":
|
||||||
delay = int(data["delay"])
|
delay = int(data["delay"])
|
||||||
patterns.set_delay(delay)
|
patterns.delay = delay
|
||||||
elif key == "brightness":
|
elif key == "brightness":
|
||||||
brightness = int(data["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":
|
elif key == "name":
|
||||||
self[key] = value
|
self[key] = value
|
||||||
self.save()
|
self.save()
|
||||||
@@ -86,9 +95,9 @@ class Settings(dict):
|
|||||||
return "Invalid key", 400
|
return "Invalid key", 400
|
||||||
self[key] = value
|
self[key] = value
|
||||||
#print(self)
|
#print(self)
|
||||||
patterns.sync()
|
|
||||||
if save:
|
if save:
|
||||||
self.save()
|
self.save()
|
||||||
|
print(self)
|
||||||
return "OK", 200
|
return "OK", 200
|
||||||
except (KeyError, ValueError):
|
except (KeyError, ValueError):
|
||||||
return "Bad request", 400
|
return "Bad request", 400
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ def web(settings, patterns):
|
|||||||
@app.route('/')
|
@app.route('/')
|
||||||
async def index_hnadler(request):
|
async def index_hnadler(request):
|
||||||
mac = wifi.get_mac().hex()
|
mac = wifi.get_mac().hex()
|
||||||
return Template('/index.html').render(settings=settings, patterns=patterns.patterns.keys(), mac=mac)
|
return Template('index.html').render(settings=settings, patterns=patterns.patterns.keys())
|
||||||
|
|
||||||
@app.route("/static/<path:path>")
|
@app.route("/static/<path:path>")
|
||||||
def static_handler(request, path):
|
def static_handler(request, path):
|
||||||
@@ -35,7 +35,7 @@ def web(settings, patterns):
|
|||||||
if data:
|
if data:
|
||||||
|
|
||||||
# Process the received data
|
# Process the received data
|
||||||
_, status_code = settings.set_settings(json.loads(data), patterns, True)
|
_, status_code = await settings.set_settings(json.loads(data), patterns, True)
|
||||||
#await ws.send(status_code)
|
#await ws.send(status_code)
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
|
|||||||
55
test/patterns.py
Normal file
55
test/patterns.py
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import uasyncio as asyncio
|
||||||
|
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)
|
||||||
|
p.load()
|
||||||
|
print(p)
|
||||||
|
p.save()
|
||||||
|
# print(p)
|
||||||
|
|
||||||
|
|
||||||
|
# wdt = WDT(timeout=10000)
|
||||||
|
|
||||||
|
# # 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():
|
||||||
|
# if fn is None:
|
||||||
|
# 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__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
|
|
||||||
32
test/patterns/blink.py
Normal file
32
test/patterns/blink.py
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
#!/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)
|
||||||
|
p.set_param("br", 64)
|
||||||
|
p.set_param("dl", 200)
|
||||||
|
p.set_param("cl", [(255, 0, 0), (0, 0, 255)])
|
||||||
|
p.select("blink")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 1500:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
await p.stop()
|
||||||
|
await task
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
|
|
||||||
138
test/patterns/n_chase.py
Normal file
138
test/patterns/n_chase.py
Normal file
@@ -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())
|
||||||
|
|
||||||
|
|
||||||
26
test/patterns/off.py
Normal file
26
test/patterns/off.py
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import uasyncio as asyncio
|
||||||
|
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)
|
||||||
|
p.select("off")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(200)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
|
|
||||||
34
test/patterns/on.py
Normal file
34
test/patterns/on.py
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import uasyncio as asyncio
|
||||||
|
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)
|
||||||
|
p.set_param("br", 64)
|
||||||
|
p.set_param("dl", 120)
|
||||||
|
p.set_param("cl", [(255, 0, 0), (0, 0, 255)])
|
||||||
|
p.select("on")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
await asyncio.sleep_ms(800)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
p.stopped = False
|
||||||
|
p.select("off")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
await asyncio.sleep_ms(100)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
|
|
||||||
160
test/patterns/pulse.py
Normal file
160
test/patterns/pulse.py
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
#!/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 pulse with attack, hold, and decay
|
||||||
|
print("Test 1: Basic pulse pattern")
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 1000) # 1 second delay between pulses
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.set_param("cl", [(255, 255, 255), (255, 255, 255)])
|
||||||
|
p.set_param("n1", 200) # Attack: 200ms
|
||||||
|
p.set_param("n2", 200) # Hold: 200ms
|
||||||
|
p.set_param("n3", 200) # Decay: 200ms
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 3 seconds to see multiple pulse cycles
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 2: Fast pulse with shorter delay
|
||||||
|
print("Test 2: Fast pulse pattern")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 500) # 500ms delay between pulses
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.set_param("n1", 100) # Attack: 100ms
|
||||||
|
p.set_param("n2", 100) # Hold: 100ms
|
||||||
|
p.set_param("n3", 100) # Decay: 100ms
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 2 seconds
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 2000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 3: Colored pulse
|
||||||
|
print("Test 3: Colored pulse pattern")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 800)
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.set_param("cl", [(255, 0, 0), (0, 0, 255)]) # Red pulse
|
||||||
|
p.set_param("n1", 150)
|
||||||
|
p.set_param("n2", 150)
|
||||||
|
p.set_param("n3", 150)
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 2 seconds
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 2000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 4: Verify delay restart timing
|
||||||
|
print("Test 4: Testing delay restart timing")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 500) # 500ms delay
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.set_param("n1", 100) # Total attack+hold+decay = 300ms, should wait 200ms more
|
||||||
|
p.set_param("n2", 100)
|
||||||
|
p.set_param("n3", 100)
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
|
||||||
|
# Monitor pulse cycles
|
||||||
|
cycle_count = 0
|
||||||
|
last_cycle_time = utime.ticks_ms()
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
# Check if we're near the start of a new cycle (LEDs off)
|
||||||
|
# This is a simplified check - in practice you'd monitor LED state
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 5: Single-shot pulse (auto=False)
|
||||||
|
print("Test 5: Single-shot pulse (auto=False)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 500) # Delay between pulses
|
||||||
|
p.set_param("auto", False) # Run only once
|
||||||
|
p.set_param("cl", [(0, 255, 0), (0, 255, 0)]) # Green pulse
|
||||||
|
p.set_param("n1", 150) # Attack: 150ms
|
||||||
|
p.set_param("n2", 150) # Hold: 150ms
|
||||||
|
p.set_param("n3", 150) # Decay: 150ms
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
|
||||||
|
# The pulse should complete once and then stop
|
||||||
|
# Total time should be ~450ms (attack + hold + decay)
|
||||||
|
# Wait a bit longer to verify it doesn't repeat
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 1000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
|
||||||
|
# Task should have completed on its own (not stopped manually)
|
||||||
|
# Verify it's stopped
|
||||||
|
if not p.stopped:
|
||||||
|
print("Warning: Pulse should have stopped automatically with auto=False")
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 6: Pulse cycles through colors
|
||||||
|
print("Test 6: Pulse cycles through colors")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 300) # cycle interval
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.set_param("cl", [
|
||||||
|
(255, 0, 0), # red
|
||||||
|
(0, 255, 0), # green
|
||||||
|
(0, 0, 255), # blue
|
||||||
|
(255, 255, 0), # yellow
|
||||||
|
])
|
||||||
|
p.set_param("n1", 50)
|
||||||
|
p.set_param("n2", 0)
|
||||||
|
p.set_param("n3", 50)
|
||||||
|
p.select("pulse")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run long enough to observe multiple color cycles
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 10000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
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)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
|
|
||||||
167
test/patterns/rainbow.py
Normal file
167
test/patterns/rainbow.py
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
#!/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 rainbow with auto=True (continuous)
|
||||||
|
print("Test 1: Basic rainbow (auto=True, n1=1)")
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 100) # Delay affects animation speed
|
||||||
|
p.set_param("n1", 1) # Step increment of 1
|
||||||
|
p.set_param("auto", True) # Run continuously
|
||||||
|
p.select("rainbow")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 3 seconds to see rainbow animation
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
await p.stop()
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 2: Fast rainbow
|
||||||
|
print("Test 2: Fast rainbow (low delay, n1=1)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 50) # Faster animation
|
||||||
|
p.set_param("n1", 1)
|
||||||
|
p.set_param("auto", True)
|
||||||
|
p.select("rainbow")
|
||||||
|
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 3: Slow rainbow
|
||||||
|
print("Test 3: Slow rainbow (high delay, n1=1)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 500) # Slower animation
|
||||||
|
p.set_param("n1", 1)
|
||||||
|
p.set_param("auto", True)
|
||||||
|
p.select("rainbow")
|
||||||
|
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: Low brightness rainbow
|
||||||
|
print("Test 4: Low brightness rainbow (n1=1)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("br", 64) # Low brightness
|
||||||
|
p.set_param("dl", 100)
|
||||||
|
p.set_param("n1", 1)
|
||||||
|
p.set_param("auto", True)
|
||||||
|
p.select("rainbow")
|
||||||
|
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: Single-step rainbow (auto=False)
|
||||||
|
print("Test 5: Single-step rainbow (auto=False, n1=1)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 100)
|
||||||
|
p.set_param("n1", 1)
|
||||||
|
p.set_param("auto", False) # Run once per call
|
||||||
|
p.set_param("step", 0) # Reset step
|
||||||
|
p.select("rainbow")
|
||||||
|
|
||||||
|
# Call rainbow multiple times to see step progression
|
||||||
|
for i in range(10):
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
await task
|
||||||
|
await asyncio.sleep_ms(100) # Small delay between steps
|
||||||
|
wdt.feed()
|
||||||
|
|
||||||
|
# Test 6: Verify step updates correctly
|
||||||
|
print("Test 6: Verify step updates (auto=False, n1=1)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("n1", 1)
|
||||||
|
initial_step = p.step
|
||||||
|
p.select("rainbow")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
await task
|
||||||
|
final_step = p.step
|
||||||
|
print(f"Step updated from {initial_step} to {final_step} (expected increment: 1)")
|
||||||
|
|
||||||
|
# Test 7: Fast step increment (n1=5)
|
||||||
|
print("Test 7: Fast rainbow (n1=5, auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 100)
|
||||||
|
p.set_param("n1", 5) # Step increment of 5 (5x faster)
|
||||||
|
p.set_param("auto", True)
|
||||||
|
p.select("rainbow")
|
||||||
|
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 8: Very fast step increment (n1=10)
|
||||||
|
print("Test 8: Very fast rainbow (n1=10, auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("n1", 10) # Step increment of 10 (10x faster)
|
||||||
|
p.set_param("auto", True)
|
||||||
|
p.select("rainbow")
|
||||||
|
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 9: Verify n1 controls step increment (auto=False)
|
||||||
|
print("Test 9: Verify n1 step increment (auto=False, n1=5)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("n1", 5) # Step increment of 5
|
||||||
|
p.set_param("auto", False)
|
||||||
|
p.set_param("step", 0) # Reset step
|
||||||
|
initial_step = p.step
|
||||||
|
p.select("rainbow")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
await task
|
||||||
|
final_step = p.step
|
||||||
|
expected_step = (initial_step + 5) % 256
|
||||||
|
print(f"Step updated from {initial_step} to {final_step} (expected: {expected_step})")
|
||||||
|
if final_step == expected_step:
|
||||||
|
print("✓ n1 step increment working correctly")
|
||||||
|
else:
|
||||||
|
print(f"✗ Step increment mismatch! Expected {expected_step}, got {final_step}")
|
||||||
|
|
||||||
|
# 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())
|
||||||
|
|
||||||
165
test/patterns/transition.py
Normal file
165
test/patterns/transition.py
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
#!/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 transition with 2 colors (auto=True, cycles continuously)
|
||||||
|
print("Test 1: Basic transition (2 colors, 1000ms delay, auto=True)")
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 1000) # 1 second transition time
|
||||||
|
p.set_param("auto", True) # Cycle continuously
|
||||||
|
p.set_param("cl", [(255, 0, 0), (0, 255, 0)]) # Red to Green
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 5 seconds to see multiple transitions
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 5000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 2: Fast transition (auto=True, cycles continuously)
|
||||||
|
print("Test 2: Fast transition (500ms delay, auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 500) # 500ms transition time
|
||||||
|
p.set_param("auto", True) # Cycle continuously
|
||||||
|
p.set_param("cl", [(0, 0, 255), (255, 255, 0)]) # Blue to Yellow
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 3 seconds
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 3: Multiple colors transition (auto=True, cycles continuously)
|
||||||
|
print("Test 3: Multiple colors transition (3 colors, auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 800)
|
||||||
|
p.set_param("auto", True) # Cycle continuously
|
||||||
|
p.set_param("cl", [
|
||||||
|
(255, 0, 0), # Red
|
||||||
|
(0, 255, 0), # Green
|
||||||
|
(0, 0, 255), # Blue
|
||||||
|
])
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 8 seconds to see full cycles
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 8000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 4: Single color (should just stay that color)
|
||||||
|
print("Test 4: Single color (should stay that color)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 1000)
|
||||||
|
p.set_param("cl", [(255, 128, 0)]) # Orange
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 3 seconds
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 5: Many colors transition (auto=True, cycles continuously)
|
||||||
|
print("Test 5: Many colors transition (5 colors, auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("dl", 600)
|
||||||
|
p.set_param("auto", True) # Cycle continuously
|
||||||
|
p.set_param("cl", [
|
||||||
|
(255, 0, 0), # Red
|
||||||
|
(255, 128, 0), # Orange
|
||||||
|
(255, 255, 0), # Yellow
|
||||||
|
(0, 255, 0), # Green
|
||||||
|
(0, 0, 255), # Blue
|
||||||
|
])
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 10 seconds to see multiple cycles
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 10000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 6: Low brightness transition (auto=True, cycles continuously)
|
||||||
|
print("Test 6: Low brightness transition (auto=True)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("br", 64) # Low brightness
|
||||||
|
p.set_param("dl", 1000)
|
||||||
|
p.set_param("auto", True) # Cycle continuously
|
||||||
|
p.set_param("cl", [(255, 0, 0), (0, 255, 0)])
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
# Run for 3 seconds
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 3000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
# Test 7: Single-shot transition (auto=False, only color1 to color2)
|
||||||
|
print("Test 7: Single-shot transition (auto=False, color1 to color2 only)")
|
||||||
|
p.stopped = False
|
||||||
|
p.set_param("br", 255)
|
||||||
|
p.set_param("dl", 1000) # 1 second transition
|
||||||
|
p.set_param("auto", False) # Run only once
|
||||||
|
p.set_param("cl", [
|
||||||
|
(255, 0, 0), # Red (color1)
|
||||||
|
(0, 255, 0), # Green (color2)
|
||||||
|
(0, 0, 255), # Blue (should be ignored)
|
||||||
|
(255, 255, 0), # Yellow (should be ignored)
|
||||||
|
])
|
||||||
|
p.select("transition")
|
||||||
|
task = asyncio.create_task(p.run())
|
||||||
|
|
||||||
|
# The transition should complete once (color1 to color2) and then stop
|
||||||
|
# Total time should be ~1000ms
|
||||||
|
# Wait a bit longer to verify it doesn't continue
|
||||||
|
start = utime.ticks_ms()
|
||||||
|
while utime.ticks_diff(utime.ticks_ms(), start) < 2000:
|
||||||
|
wdt.feed()
|
||||||
|
await asyncio.sleep_ms(10)
|
||||||
|
|
||||||
|
# Task should have completed on its own (not stopped manually)
|
||||||
|
# Verify it's stopped
|
||||||
|
if not p.stopped:
|
||||||
|
print("Warning: Transition should have stopped automatically with auto=False")
|
||||||
|
p.stopped = True
|
||||||
|
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)
|
||||||
|
p.stopped = True
|
||||||
|
await task
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(main())
|
||||||
|
|
||||||
110
test/test_patterns_save_load.py
Normal file
110
test/test_patterns_save_load.py
Normal file
@@ -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())
|
||||||
|
|
||||||
111
test/test_save_load.py
Normal file
111
test/test_save_load.py
Normal file
@@ -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()
|
||||||
|
|
||||||
Reference in New Issue
Block a user