From 75950a7eae03fea5b2a6ba261e7d08c3eabf472a Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Tue, 22 Sep 2026 22:45:33 +0300 Subject: [PATCH] =?UTF-8?q?work:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D1=8B=D1=81=D0=BE=D0=BA=D0=BE=D1=83=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BD=D0=B5=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20=D0=B2=D1=8B?= =?UTF-8?q?=D1=82=D1=8F=D0=B6=D0=BA=D0=BE=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/elica/controller.py | 231 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 app/elica/controller.py diff --git a/app/elica/controller.py b/app/elica/controller.py new file mode 100644 index 0000000..b2b6698 --- /dev/null +++ b/app/elica/controller.py @@ -0,0 +1,231 @@ +import asyncio +from collections.abc import Callable + +from .models import ElicaLogicalState +from .service import ElicaService + + +class ElicaController: + """ + Высокоуровневый контроллер вытяжки Elica. + + ElicaService отвечает за ESP32, MQTT, реле и входы. + ElicaController работает уже с понятиями самой вытяжки: + питание, скорость, таймер и свет. + """ + + def __init__( + self, + service: ElicaService, + state_timeout: float = 3.0, + poll_interval: float = 0.05, + ): + self._service = service + self._state_timeout = state_timeout + self._poll_interval = poll_interval + + # Не допускаем одновременное выполнение нескольких + # последовательностей нажатий кнопок. + self._lock = asyncio.Lock() + + @property + def service(self) -> ElicaService: + return self._service + + @property + def state(self) -> ElicaLogicalState: + return self._service.logical_state + + # ------------------------------------------------------------------ + # Internal helpers + # ------------------------------------------------------------------ + def _ensure_available(self) -> None: + if not self._service.running: + raise RuntimeError("Elica service is not running") + + if not self._service.state.mqtt_connected: + raise RuntimeError("Elica MQTT is not connected") + + if not self._service.state.device_online: + raise RuntimeError("ESP32 Elica controller is offline") + + async def _wait_state( + self, + predicate: Callable[[ElicaLogicalState], bool], + description: str, + timeout: float | None = None, + ) -> ElicaLogicalState: + """Ждёт подтверждения требуемого состояния по обратной связи.""" + timeout = self._state_timeout if timeout is None else timeout + deadline = asyncio.get_running_loop().time() + timeout + + while True: + self._ensure_available() + state = self.state + + if predicate(state): + return state + + if asyncio.get_running_loop().time() >= deadline: + raise TimeoutError( + f"Elica did not reach expected state: {description}; " + f"current state: {state}" + ) + + await asyncio.sleep(self._poll_interval) + + async def _power_on_locked(self) -> ElicaLogicalState: + """Включает вытяжку. Вызывается только под self._lock.""" + self._ensure_available() + state = self.state + + if state.power: + return state + + await self._service.press_power() + + return await self._wait_state( + lambda value: value.power, + "power on", + ) + + async def _power_off_locked(self) -> ElicaLogicalState: + """Выключает вытяжку. Вызывается только под self._lock.""" + self._ensure_available() + state = self.state + + if not state.power: + return state + + await self._service.press_power() + + return await self._wait_state( + lambda value: not value.power, + "power off", + ) + + # ------------------------------------------------------------------ + # Power + # ------------------------------------------------------------------ + + async def power_on(self) -> ElicaLogicalState: + async with self._lock: + return await self._power_on_locked() + + async def power_off(self) -> ElicaLogicalState: + async with self._lock: + return await self._power_off_locked() + + # ------------------------------------------------------------------ + # Speed + # ------------------------------------------------------------------ + + async def set_speed(self, speed: int) -> ElicaLogicalState: + """ + Устанавливает скорость 1-4. + + Контроллер нажимает кнопку Speed и после каждого нажатия + проверяет фактическую скорость по индикаторам. + """ + if not 1 <= speed <= 4: + raise ValueError("Elica speed must be between 1 and 4") + + async with self._lock: + self._ensure_available() + state = self.state + + if not state.power: + state = await self._power_on_locked() + + # После включения power LED может обновиться раньше speed LED. + if state.speed == 0: + state = await self._wait_state( + lambda value: value.power and 1 <= value.speed <= 4, + "initial speed", + ) + + if state.speed == speed: + return state + + # Не предполагаем конкретный порядок скоростей. + # После каждого нажатия смотрим, что реально получилось. + for _ in range(4): + previous_speed = state.speed + + await self._service.press_speed() + + state = await self._wait_state( + lambda value: ( + value.power + and 1 <= value.speed <= 4 + and value.speed != previous_speed + ), + "speed change", + ) + + if state.speed == speed: + return state + + raise RuntimeError( + f"Unable to set Elica speed to {speed}; " + f"current speed: {state.speed}" + ) + + # ------------------------------------------------------------------ + # Timer + # ------------------------------------------------------------------ + + async def set_timer(self, enabled: bool) -> ElicaLogicalState: + """ + Включает или выключает таймер. + + Состояние подтверждается по миганию индикатора скорости. + """ + async with self._lock: + self._ensure_available() + state = self.state + + if not enabled and not state.power: + return state + + if enabled and not state.power: + state = await self._power_on_locked() + + if state.timer == enabled: + return state + + await self._service.press_timer() + + # При выключении таймера logical_state.timer остаётся True, + # пока не истечёт blink_hold_s после последнего мигания. + timeout = max( + self._state_timeout, + self._service.config.blink_hold_s + 1.5, + ) + + return await self._wait_state( + lambda value: value.timer == enabled, + f"timer {'on' if enabled else 'off'}", + timeout=timeout, + ) + + async def timer_on(self) -> ElicaLogicalState: + return await self.set_timer(True) + + async def timer_off(self) -> ElicaLogicalState: + return await self.set_timer(False) + + # ------------------------------------------------------------------ + # Light + # ------------------------------------------------------------------ + + async def toggle_light(self) -> None: + """ + Переключает свет. + + Обратной связи о состоянии света сейчас нет, + поэтому light_on/light_off реализовать достоверно нельзя. + """ + async with self._lock: + self._ensure_available() + await self._service.press_light() \ No newline at end of file