feat: add pluggable alarm styles and migrate wecker.py
Introduce a styles/ plugin package: - styles/base.py: AlarmStyle ABC (injected set_led, update()->bool contract) - styles/blink.py: BlinkStyle, the existing count-the-blinks puzzle moved out of wecker.py's AlarmClock - styles/simple.py: SimpleStyle, press-once-to-stop (the new default style) - styles/__init__.py: STYLES registry + get_style() validator + LEGACY_STYLE wecker.py now resolves the style via the registry and owns only the shared music/button/cleanup loop; the --style CLI arg defaults to blink so existing cron entries keep their behaviour. Unknown styles raise before hardware init.
This commit is contained in:
@@ -2,7 +2,6 @@ import RPi.GPIO as GPIO
|
||||
import time
|
||||
import logging
|
||||
import pygame
|
||||
import random
|
||||
import sys
|
||||
import os
|
||||
import fcntl
|
||||
@@ -12,6 +11,7 @@ os.environ.setdefault("SDL_AUDIODRIVER", "pulse")
|
||||
from logging.handlers import RotatingFileHandler
|
||||
|
||||
from common import PID_FILE
|
||||
from styles import STYLES, LEGACY_STYLE, get_style
|
||||
|
||||
# Configure logging with rotation to avoid unbounded growth on the SD card.
|
||||
logging.basicConfig(
|
||||
@@ -91,16 +91,6 @@ def setup(music_file: str | None = None):
|
||||
if "pytest" not in sys.modules:
|
||||
sys.exit(1)
|
||||
|
||||
# State Machine states for the flow
|
||||
STATE_RINGING = 0
|
||||
STATE_WAIT_BEFORE_BLINK = 1
|
||||
STATE_BLINKING = 2
|
||||
STATE_WAIT_FOR_INPUT = 3
|
||||
STATE_EVALUATING = 4
|
||||
STATE_WAIT_BEFORE_RETRY = 5
|
||||
|
||||
BLINK_INTERVAL = 0.3
|
||||
|
||||
|
||||
def set_led(on):
|
||||
"""Turns the LED on or off (LOW = ON, HIGH = OFF)"""
|
||||
@@ -111,122 +101,23 @@ def set_led(on):
|
||||
GPIO.output(LED_PIN, GPIO.HIGH)
|
||||
|
||||
|
||||
class AlarmClock:
|
||||
def __init__(self):
|
||||
self.state = STATE_RINGING
|
||||
self.target_blinks = 0
|
||||
self.user_presses = 0
|
||||
self.last_interaction_time = 0
|
||||
self.button_was_pressed = False
|
||||
self._blink_phase: int = 0
|
||||
self._blink_phases: int = 0
|
||||
self._blink_next_toggle: float | None = None
|
||||
def run_alarm(
|
||||
style_name: str = LEGACY_STYLE,
|
||||
test_mode: bool = False,
|
||||
music_file: str | None = None,
|
||||
):
|
||||
"""Run the alarm clock with the given style until the style signals stop.
|
||||
|
||||
def update(self, now, is_pressed):
|
||||
button_just_pressed = False
|
||||
if is_pressed and not self.button_was_pressed:
|
||||
self.button_was_pressed = True
|
||||
button_just_pressed = True
|
||||
elif not is_pressed and self.button_was_pressed:
|
||||
self.button_was_pressed = False
|
||||
|
||||
if self.state == STATE_RINGING:
|
||||
if button_just_pressed:
|
||||
logging.info(
|
||||
"Alarm button pressed! Puzzle started. Waiting 3 seconds..."
|
||||
)
|
||||
self.state = STATE_WAIT_BEFORE_BLINK
|
||||
self.last_interaction_time = now
|
||||
|
||||
elif self.state == STATE_WAIT_BEFORE_BLINK:
|
||||
if now - self.last_interaction_time >= 3.0:
|
||||
self.target_blinks = random.randint(1, 7)
|
||||
logging.info(f"Blinking {self.target_blinks} times...")
|
||||
self.state = STATE_BLINKING
|
||||
self._blink_phase = 0
|
||||
self._blink_phases = self.target_blinks * 2
|
||||
self._blink_next_toggle = now + BLINK_INTERVAL
|
||||
set_led(True)
|
||||
|
||||
elif self.state == STATE_BLINKING:
|
||||
# Non-blocking blink: toggle the LED at fixed intervals so the main
|
||||
# loop keeps sampling the button and can be interrupted.
|
||||
if self._blink_next_toggle is None:
|
||||
# Safety for direct state assignment (e.g. tests).
|
||||
self._blink_phase = 0
|
||||
self._blink_phases = self.target_blinks * 2
|
||||
self._blink_next_toggle = now + BLINK_INTERVAL
|
||||
set_led(True)
|
||||
|
||||
while now >= self._blink_next_toggle:
|
||||
self._blink_phase += 1
|
||||
self._blink_next_toggle += BLINK_INTERVAL
|
||||
if self._blink_phase >= self._blink_phases:
|
||||
set_led(False)
|
||||
self._blink_phase = 0
|
||||
self._blink_phases = 0
|
||||
self._blink_next_toggle = None
|
||||
logging.info("Blinking finished. Waiting for input...")
|
||||
self.state = STATE_WAIT_FOR_INPUT
|
||||
self.user_presses = 0
|
||||
self.last_interaction_time = now
|
||||
if "GPIO" in globals() and hasattr(GPIO, "input"):
|
||||
self.button_was_pressed = GPIO.input(BUTTON_PIN) == GPIO.LOW
|
||||
break
|
||||
else:
|
||||
set_led(self._blink_phase % 2 == 0)
|
||||
|
||||
elif self.state == STATE_WAIT_FOR_INPUT:
|
||||
set_led(is_pressed)
|
||||
|
||||
if button_just_pressed:
|
||||
self.user_presses += 1
|
||||
logging.info(f"Button pressed: {self.user_presses} times")
|
||||
|
||||
if is_pressed:
|
||||
self.last_interaction_time = now
|
||||
|
||||
if not is_pressed and (now - self.last_interaction_time >= 3.0):
|
||||
self.state = STATE_EVALUATING
|
||||
|
||||
elif self.state == STATE_EVALUATING:
|
||||
logging.info(
|
||||
f"Evaluation: Target={self.target_blinks}, Entered={self.user_presses}"
|
||||
)
|
||||
if self.user_presses == self.target_blinks:
|
||||
logging.info("Puzzle solved correctly! Alarm clock is stopping.")
|
||||
if (
|
||||
"pygame" in globals()
|
||||
and hasattr(pygame, "mixer")
|
||||
and pygame.mixer.get_init()
|
||||
):
|
||||
pygame.mixer.music.stop()
|
||||
set_led(False)
|
||||
return False # Indicate we should stop running
|
||||
else:
|
||||
logging.info("Incorrect input! Waiting 3 seconds before retrying...")
|
||||
self.state = STATE_WAIT_BEFORE_RETRY
|
||||
self.last_interaction_time = time.time()
|
||||
set_led(False)
|
||||
|
||||
elif self.state == STATE_WAIT_BEFORE_RETRY:
|
||||
if now - self.last_interaction_time >= 5.0:
|
||||
self.target_blinks = random.randint(1, 7)
|
||||
logging.info(f"New attempt! Blinking {self.target_blinks} times...")
|
||||
self.state = STATE_BLINKING
|
||||
|
||||
return True # Keep running
|
||||
|
||||
|
||||
def run_alarm(test_mode=False, music_file: str | None = None):
|
||||
The runner owns everything shared (music loop, button sampling, cleanup);
|
||||
the style only decides when to stop and what the LED does.
|
||||
"""
|
||||
style = get_style(style_name)(set_led)
|
||||
setup(music_file=music_file)
|
||||
logging.info("Alarm clock started. Music is playing in an endless loop.")
|
||||
if "pygame" in globals() and hasattr(pygame, "mixer") and pygame.mixer.get_init():
|
||||
pygame.mixer.music.play(-1)
|
||||
|
||||
set_led(False) # LED off at start
|
||||
|
||||
clock = AlarmClock()
|
||||
set_led(False) # LED off at start; the style drives it from here.
|
||||
|
||||
try:
|
||||
while True:
|
||||
@@ -237,7 +128,7 @@ def run_alarm(test_mode=False, music_file: str | None = None):
|
||||
else:
|
||||
is_pressed = False
|
||||
|
||||
keep_running = clock.update(now, is_pressed)
|
||||
keep_running = style.update(now, is_pressed)
|
||||
|
||||
if not keep_running or test_mode:
|
||||
break
|
||||
@@ -257,11 +148,17 @@ if __name__ == "__main__":
|
||||
default=os.environ.get("MUSIC_FILE", DEFAULT_MUSIC_FILE),
|
||||
help="Path to the MP3 file to play (default: $MUSIC_FILE or default track).",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--style",
|
||||
default=LEGACY_STYLE,
|
||||
choices=sorted(STYLES),
|
||||
help="Alarm style to run (default: %(default)s).",
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
ensure_single_instance()
|
||||
try:
|
||||
run_alarm(music_file=args.music_file)
|
||||
run_alarm(style_name=args.style, music_file=args.music_file)
|
||||
finally:
|
||||
pygame.mixer.quit()
|
||||
GPIO.cleanup()
|
||||
|
||||
Reference in New Issue
Block a user