From 075e7d277ae20de5527b3fe405592ae9c60b6424 Mon Sep 17 00:00:00 2001 From: Maximilian Giller Date: Sun, 3 Mar 2024 15:58:12 +0100 Subject: [PATCH] Removed unnecessary abstraction; Implemented pattern endpoint --- src/actions.py | 33 +++++---------- src/handler/climate/climate.py | 11 ----- src/handler/climate/dummy_climate.py | 7 ---- src/handler/{climate => }/dht22_climate.py | 3 +- src/handler/matrix/dummy_matrix_display.py | 40 ------------------- src/handler/matrix/matrix_display.py | 27 ------------- ...ma_matrix_display.py => matrix_display.py} | 32 +++++++++++++-- src/main.py | 8 ++++ 8 files changed, 47 insertions(+), 114 deletions(-) delete mode 100644 src/handler/climate/climate.py delete mode 100644 src/handler/climate/dummy_climate.py rename src/handler/{climate => }/dht22_climate.py (83%) delete mode 100644 src/handler/matrix/dummy_matrix_display.py delete mode 100644 src/handler/matrix/matrix_display.py rename src/handler/{matrix/luma_matrix_display.py => matrix_display.py} (72%) diff --git a/src/actions.py b/src/actions.py index 25790a9..50c9f79 100644 --- a/src/actions.py +++ b/src/actions.py @@ -1,34 +1,14 @@ import asyncio from datetime import datetime -import logging import os from config import climate_log_file, dht22_pin -from handler.matrix.matrix_display import MatrixDisplayAdapter -from handler.climate.climate import ClimateAdapter +from .handler.dht22_climate import Dht22Climate +from .handler.matrix_display import MatrixDisplay -climate_sensor: ClimateAdapter = None -matrix_display: MatrixDisplayAdapter = None -try: - from handler.matrix.luma_matrix_display import LumaMatrixDisplay - - matrix_display = LumaMatrixDisplay() -except: - from handler.matrix.dummy_matrix_display import DummyMatrixDisplay - - logging.info("Using Dummy Matrix Display") - matrix_display = DummyMatrixDisplay() - -try: - from handler.climate.dht22_climate import Dht22Climate - - climate_sensor = Dht22Climate(dht22_pin) -except: - from handler.climate.dummy_climate import DummyClimate - - logging.info("Using Dummy Climate") - climate_sensor = DummyClimate() +climate_sensor = Dht22Climate(dht22_pin) +matrix_display = MatrixDisplay() async def log_temperature(): @@ -57,3 +37,8 @@ async def display_time(): seconds_until_next_minute = 60 - datetime.now().second await asyncio.sleep(seconds_until_next_minute) + + +async def display_pattern(*args, **kwargs): + while True: + await matrix_display.pattern(*args, **kwargs) diff --git a/src/handler/climate/climate.py b/src/handler/climate/climate.py deleted file mode 100644 index d2d7c6d..0000000 --- a/src/handler/climate/climate.py +++ /dev/null @@ -1,11 +0,0 @@ -class ClimateAdapter: - def __init__(self): - self.last_read = None - - def read(self): - raise NotImplemented() - - def get_last_read(self): - if self.last_read is None: - return self.read() - return self.last_read diff --git a/src/handler/climate/dummy_climate.py b/src/handler/climate/dummy_climate.py deleted file mode 100644 index 6602615..0000000 --- a/src/handler/climate/dummy_climate.py +++ /dev/null @@ -1,7 +0,0 @@ -from handler.climate.climate import ClimateAdapter - - -class DummyClimate(ClimateAdapter): - def read(self): - self.last_read = {"temperature": 22.3, "humidity": 50.1} - return self.last_read diff --git a/src/handler/climate/dht22_climate.py b/src/handler/dht22_climate.py similarity index 83% rename from src/handler/climate/dht22_climate.py rename to src/handler/dht22_climate.py index 26f7617..2cebb57 100644 --- a/src/handler/climate/dht22_climate.py +++ b/src/handler/dht22_climate.py @@ -1,8 +1,7 @@ import Adafruit_DHT -from handler.climate.climate import ClimateAdapter -class Dht22Climate(ClimateAdapter): +class Dht22Climate(): def __init__(self, pin): super().__init__() self.sensor = Adafruit_DHT.AM2302 diff --git a/src/handler/matrix/dummy_matrix_display.py b/src/handler/matrix/dummy_matrix_display.py deleted file mode 100644 index 9b4c3e2..0000000 --- a/src/handler/matrix/dummy_matrix_display.py +++ /dev/null @@ -1,40 +0,0 @@ -from handler.matrix.matrix_display import MatrixDisplayAdapter -import logging - - -class DummyMatrixDisplay(MatrixDisplayAdapter): - def __init__(self, *, contrast=0, text_speed=0.02) -> None: - self.contrast = contrast - self.text_speed = text_speed - logging.info("DummyMatrixDisplay: Initialized") - - def set_contrast(self, contrast: int): - """Set contrast for all actions. - - Args: - contrast (int): [0, 255] - """ - self.contrast = contrast - logging.info(f"DummyMatrixDisplay: setting contrast to {contrast}") - - def show_text(self, text): - logging.info(f"DummyMatrixDisplay: Showing text '{text}'") - - def flash(self, count=1, contrast=None): - if contrast: - logging.info( - f"DummyMatrixDisplay: flashing {count} times with contrast {contrast}" - ) - else: - logging.info( - f"DummyMatrixDisplay: flashing {count} times with general contrast" - ) - - def turn_off(self): - logging.info(f"DummyMatrixDisplay: turning off") - - def turn_full(self): - logging.info(f"DummyMatrixDisplay: turning full") - - def show_current_time(self): - logging.info(f"DummyMatrixDisplay: showing time") diff --git a/src/handler/matrix/matrix_display.py b/src/handler/matrix/matrix_display.py deleted file mode 100644 index 5eea66a..0000000 --- a/src/handler/matrix/matrix_display.py +++ /dev/null @@ -1,27 +0,0 @@ -class MatrixDisplayAdapter: - def __init__(self, *, contrast=0, text_speed=0.02) -> None: - self.contrast = contrast - self.text_speed = text_speed - - def set_contrast(self, contrast: int): - """Set contrast for all actions. - - Args: - contrast (int): [0, 255] - """ - self.contrast = contrast - - def show_text(self, text): - raise NotImplementedError() - - def flash(self, count=1, contrast=None): - raise NotImplementedError() - - def turn_off(self): - raise NotImplementedError() - - def turn_full(self): - raise NotImplementedError() - - def show_current_time(self): - raise NotImplementedError() diff --git a/src/handler/matrix/luma_matrix_display.py b/src/handler/matrix_display.py similarity index 72% rename from src/handler/matrix/luma_matrix_display.py rename to src/handler/matrix_display.py index 0464c84..6629272 100644 --- a/src/handler/matrix/luma_matrix_display.py +++ b/src/handler/matrix_display.py @@ -1,3 +1,4 @@ +import asyncio import time from datetime import datetime from luma.core.interface.serial import spi, noop @@ -7,10 +8,8 @@ from luma.core import legacy from luma.core.virtual import viewport from luma.core.legacy.font import proportional, CP437_FONT -from handler.matrix.matrix_display import MatrixDisplayAdapter - -class LumaMatrixDisplay(MatrixDisplayAdapter): +class MatrixDisplay: def __init__(self, *, contrast=0, text_speed=0.02) -> None: self.contrast = contrast self.text_speed = text_speed @@ -69,6 +68,33 @@ class LumaMatrixDisplay(MatrixDisplayAdapter): with canvas(self.device) as draw: draw.rectangle((0, 0, 31, 7), outline="white", fill="white") + async def pattern(self, pattern: str = "0,1", off_ms: int = 500, on_ms: int = 500): + # Preprocess pattern + pattern_steps = [step.strip() == "1" for step in pattern.split(",")] + + class SimplifiedStep: + state: bool + size: int + + def __init__(self, state: bool) -> None: + self.state = state + self.size = 1 + + pattern_simplified: list[SimplifiedStep] = [] + for step in pattern_steps: + if len(pattern_simplified) == 0 or step != pattern_simplified[-1].state: + pattern_simplified.append(SimplifiedStep(step, off_ms, on_ms)) + else: + pattern_simplified[-1].size += 1 + + # Execute pattern + for step in pattern_simplified: + if step.state: + self.turn_full() + else: + self.turn_off() + await asyncio.sleep(step.size * (on_ms if step.state else off_ms) / 1000) + def show_current_time(self): self.device.contrast(self.contrast) hour = str(datetime.now().hour).rjust(2, "0") diff --git a/src/main.py b/src/main.py index f00b77f..e334d41 100644 --- a/src/main.py +++ b/src/main.py @@ -90,6 +90,14 @@ async def flash(count: int = 1, contrast: Optional[int] = None): return {"message": "Display flashed"} +@app.post("/pattern") +async def flash(pattern: str="0,1", off_ms: int = 500, on_ms: int = 500): + await queue.set_idle_action( + matrix_display.pattern, pattern=pattern, off_ms=off_ms, on_ms=on_ms + ) + return {"message": "Activated pattern."} + + @app.post("/contrast") async def contrast(contrast: Optional[int] = None): if contrast: