bgrolleman/Amirine_Cosplay_Lights
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace example shows with numbered production shows and add sparkle flag

Browse Source 
- Rename all show .txt files with NNN_ numeric prefix so order is explicit
  and controlled by filename (001_heartbeat_red through 006_party)
- Drop HOME_SHOW special-casing from convert_all.py; show 0 is simply the
  lowest-numbered file
- Add SHOW_FLAG_SPARKLE support: shows can declare '// flags: sparkle' to
  overlay random white flashes on top of the base color each frame
- Wire sparkle into led_controller and config.h (SPARKLE_CHANCE/FRAMES)
- Replace old placeholder/example shows with the six production shows

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Bas Grolleman
2026-05-24 13:59:25 +02:00
parent a96f378c9c
commit ab2c1b34b4
30 changed files with 205 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
converter/convert_all.py
+34 -32
View File
@@ -10,8 +10,12 @@ Usage:
python converter/convert_all.py
(or via Makefile: make shows)
Show 0 is always 'blue_breath' — the home/reset show.
All other shows are sorted alphabetically and follow after it.
Show files must be named NNN_<name>.txt (e.g. 001_heartbeat_red.txt).
They run in numeric order; show 0 (the home/reset show) is the lowest-numbered file.
Show file directives (in comment lines):
// mode: single — play once, then advance to the next show (default: loop)
// flags: sparkle — overlay random white sparkles on this show
SPDX-License-Identifier: BSD-2-Clause
"""
@@ -27,9 +31,6 @@ ROOT_DIR = SCRIPT_DIR.parent
SHOWS_DIR = SCRIPT_DIR / "shows"
SKETCH_DIR = ROOT_DIR / "arduino" / "cosplay_lights"
# The special first show — always placed at index 0.
HOME_SHOW = "blue_breath"
# Regex to match a valid step line: #RRGGBB, duration_ms
STEP_PATTERN = re.compile(r'^\s*#([0-9A-Fa-f]{6})\s*,\s*(\d+)')
@@ -46,21 +47,29 @@ def hex_to_rgb(hex_str: str) -> tuple[int, int, int]:
return int(hex_str[0:2], 16), int(hex_str[2:4], 16), int(hex_str[4:6], 16)
def parse_show_file(filepath: Path) -> tuple[list[tuple[int, int, int, int]], str]:
def parse_show_file(filepath: Path) -> tuple[list[tuple[int, int, int, int]], str, int]:
"""
Parse a .txt show file in one pass. Returns (steps, mode_constant).
Parse a .txt show file in one pass. Returns (steps, mode_constant, flags).
steps: list of (r, g, b, duration_ms) tuples
mode_constant: 'SHOW_LOOP' or 'SHOW_SINGLE' (default SHOW_LOOP if not set)
flags: integer bitmask (0x01 = sparkle, matches SHOW_FLAG_SPARKLE in lightshow_format.h)
Raises ValueError on malformed lines or empty files.
"""
steps = []
mode = "SHOW_LOOP"
flags = 0
with open(filepath) as f:
for lineno, raw_line in enumerate(f, 1):
m = re.match(r'^\s*//\s*mode:\s*(\w+)', raw_line, re.IGNORECASE)
if m:
if re.match(r'^\s*//\s*mode:\s*(\w+)', raw_line, re.IGNORECASE):
m = re.match(r'^\s*//\s*mode:\s*(\w+)', raw_line, re.IGNORECASE)
mode = "SHOW_SINGLE" if m.group(1).lower() == "single" else "SHOW_LOOP"
continue
mf = re.match(r'^\s*//\s*flags:\s*(.+)', raw_line, re.IGNORECASE)
if mf:
flag_tokens = [t.strip().lower() for t in mf.group(1).split(",")]
if "sparkle" in flag_tokens:
flags |= 0x01
continue
line = raw_line.split("//")[0].strip()
if not line:
continue
@@ -75,7 +84,7 @@ def parse_show_file(filepath: Path) -> tuple[list[tuple[int, int, int, int]], st
steps.append((r, g, b, duration))
if not steps:
raise ValueError(f"{filepath.name}: file contains no steps.")
return steps, mode
return steps, mode, flags
def render_show_header(steps: list, source_name: str, symbol: str) -> str:
@@ -101,23 +110,23 @@ def render_show_header(steps: list, source_name: str, symbol: str) -> str:
return "\n".join(lines)
def render_shows_index(ordered: list[tuple[str, str]]) -> str:
"""Render the master shows.h index file. ordered = [(stem, mode_constant), ...]"""
includes = "\n".join(f'#include "show_{stem}.h"' for stem, _ in ordered)
def render_shows_index(ordered: list[tuple[str, str, int]]) -> str:
"""Render the master shows.h index file. ordered = [(stem, mode_constant, flags), ...]"""
includes = "\n".join(f'#include "show_{stem}.h"' for stem, _, __ in ordered)
entries = "\n".join(
f" {{{filename_to_symbol(s)}, {filename_to_symbol(s)}_LENGTH, {mode}}},"
f" {{{filename_to_symbol(s)}, {filename_to_symbol(s)}_LENGTH, {mode}, {'SHOW_FLAG_SPARKLE' if flags & 0x01 else '0'}}},"
+ (" // 0 — home show" if i == 0 else f" // {i}")
for i, (s, mode) in enumerate(ordered)
for i, (s, mode, flags) in enumerate(ordered)
)
count = len(ordered)
return f"""\
// =====================================================================
// shows.h — Master show index.
// Generated by: make shows (converter/convert_all.py)
// Do not edit manually — add .txt files to converter/shows/ instead.
// Do not edit manually — add NNN_<name>.txt files to converter/shows/ instead.
// =====================================================================
//
// Show 0 is always the home/reset show (blue breath).
// Show 0 is the lowest-numbered .txt file (home/reset show).
// Holding the button resets back to show 0.
//
// SPDX-License-Identifier: BSD-2-Clause
@@ -140,20 +149,12 @@ const uint8_t SHOW_COUNT = {count};
# ---- Main --------------------------------------------------------------
def main() -> None:
txt_files = sorted(SHOWS_DIR.glob("*.txt"), key=lambda p: p.stem.lower())
txt_files = sorted(SHOWS_DIR.glob("*.txt"), key=lambda p: p.name.lower())
if not txt_files:
print(f"No .txt files found in {SHOWS_DIR}")
sys.exit(1)
# Separate the home show from the rest; sort the rest alphabetically.
home_file = SHOWS_DIR / f"{HOME_SHOW}.txt"
other_files = [f for f in txt_files if f.stem != HOME_SHOW]
if not home_file.exists():
print(f"Warning: home show '{HOME_SHOW}.txt' not found — show 0 will be {txt_files[0].name}")
ordered_files = txt_files
else:
ordered_files = [home_file] + other_files
ordered_files = txt_files
SKETCH_DIR.mkdir(parents=True, exist_ok=True)
@@ -164,12 +165,13 @@ def main() -> None:
stem = txt_path.stem
symbol = filename_to_symbol(stem)
try:
steps, mode = parse_show_file(txt_path)
steps, mode, flags = parse_show_file(txt_path)
header = render_show_header(steps, txt_path.name, symbol)
out = SKETCH_DIR / f"show_{stem}.h"
out.write_text(header, encoding="utf-8")
print(f" OK {txt_path.name} → show_{stem}.h ({len(steps)} steps, {mode})")
converted.append((stem, mode))
flag_str = " sparkle" if flags & 0x01 else ""
print(f" OK {txt_path.name} → show_{stem}.h ({len(steps)} steps, {mode}{flag_str})")
converted.append((stem, mode, flags))
except ValueError as e:
print(f" ERR {e}")
errors.append(stem)
@@ -182,7 +184,7 @@ def main() -> None:
sys.exit(1)
# Remove stale show_*.h files no longer in the converted list.
expected = {SKETCH_DIR / f"show_{stem}.h" for stem, _ in converted}
expected = {SKETCH_DIR / f"show_{stem}.h" for stem, _, __ in converted}
for stale in SKETCH_DIR.glob("show_*.h"):
if stale not in expected:
stale.unlink()
@@ -191,7 +193,7 @@ def main() -> None:
# Regenerate shows.h
index_path = SKETCH_DIR / "shows.h"
index_path.write_text(render_shows_index(converted), encoding="utf-8")
stems = [s for s, _ in converted]
stems = [s for s, _, __ in converted]
print(f"\n OK shows.h updated ({len(converted)} shows, show 0 = {stems[0]})")
print( " Run 'make upload' to compile and send to the Arduino.")