From 3b3c7a3f135e2c030ba4878a2217679d678f5c47 Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Tue, 22 Sep 2026 23:07:40 +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=B7=D0=B0=D1=89=D0=B8=D1=82=D1=83=20=D0=BE=D1=82=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B6=D0=B0=D1=82=D0=B8=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8.=20=D0=92=20=D1=81=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D0=B0=D0=B5=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=B6=D0=B0=D1=82=D0=B8=D0=B5.=20=D0=A2=D0=B0?= =?UTF-8?q?=D0=BA=D0=B6=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D1=8B=D1=82=D1=8F=D0=B6=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/elica/controller.py | 26 ++++++++++---- app/elica/service.py | 76 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/app/elica/controller.py b/app/elica/controller.py index b2b6698..fd11ffa 100644 --- a/app/elica/controller.py +++ b/app/elica/controller.py @@ -61,6 +61,7 @@ class ElicaController: while True: self._ensure_available() + self._ensure_feedback_ready() state = self.state if predicate(state): @@ -76,7 +77,7 @@ class ElicaController: async def _power_on_locked(self) -> ElicaLogicalState: """Включает вытяжку. Вызывается только под self._lock.""" - self._ensure_available() + self._ensure_ready() state = self.state if state.power: @@ -91,7 +92,7 @@ class ElicaController: async def _power_off_locked(self) -> ElicaLogicalState: """Выключает вытяжку. Вызывается только под self._lock.""" - self._ensure_available() + self._ensure_ready() state = self.state if not state.power: @@ -131,7 +132,7 @@ class ElicaController: raise ValueError("Elica speed must be between 1 and 4") async with self._lock: - self._ensure_available() + self._ensure_ready() state = self.state if not state.power: @@ -182,7 +183,7 @@ class ElicaController: Состояние подтверждается по миганию индикатора скорости. """ async with self._lock: - self._ensure_available() + self._ensure_ready() state = self.state if not enabled and not state.power: @@ -227,5 +228,18 @@ class ElicaController: поэтому light_on/light_off реализовать достоверно нельзя. """ async with self._lock: - self._ensure_available() - await self._service.press_light() \ No newline at end of file + self._ensure_ready() + await self._service.press_light() + + # ------------------------------------------------------------------ + # Синхронизация начального состояния + # ------------------------------------------------------------------ + async def _ensure_ready(self) -> None: + """Проверяет доступность и ждёт исходной синхронизации feedback.""" + self._ensure_available() + await self._service.wait_feedback_ready(timeout=self._state_timeout) + self._ensure_available() + + def _ensure_feedback_ready(self) -> None: + if not self._service.feedback_ready: + raise RuntimeError("Elica feedback is not synchronized") \ No newline at end of file diff --git a/app/elica/service.py b/app/elica/service.py index 46c11ae..ba163c6 100644 --- a/app/elica/service.py +++ b/app/elica/service.py @@ -31,6 +31,7 @@ class ElicaService: self._last_speed = 0 self._speed_led_off_at: float | None = None self._last_blink_at: float | None = None + self._received_input_mask = 0 @property @@ -109,6 +110,8 @@ class ElicaService: logger.info("ESP32 elica MQTT connected") + self._received_input_mask = 0 + # ------------------------------------------------------------------ # Подписки сервиса # ------------------------------------------------------------------ @@ -139,6 +142,8 @@ class ElicaService: else: logger.info("ESP32 Elica MQTT disconnected: %s",reason_code) + self._received_input_mask = 0 + self._state = replace( self._state, mqtt_connected=False, @@ -293,6 +298,9 @@ class ElicaService: input_states=tuple(input_states), last_message_at=datetime.now(timezone.utc), ) + + self._received_input_mask |= 1 << (input_number - 1) + self._update_panel_tracker() def input_state(self, input_number: int) -> bool: @@ -457,6 +465,8 @@ class ElicaService: "pulse_ms": self._config.pulse_ms, "panel": self.panel_state.to_dict(), "elica": self.logical_state.to_dict(), + "feedback_ready": self.feedback_ready, + "missing_feedback_inputs": self.missing_feedback_inputs, **self._state.to_dict(), } @@ -471,11 +481,22 @@ class ElicaService: duration_ms = pulse_ms if pulse_ms is not None else self._config.pulse_ms self.set_relay(relay, True) - await self.wait_relay_state(relay, True) - await asyncio.sleep(duration_ms / 1000) - self.set_relay(relay, False) + + try: + await self.wait_relay_state(relay, True) + await asyncio.sleep(duration_ms / 1000) + + finally: + try: + self.set_relay(relay, False) + except Exception: + logger.exception("Failed to release Elica relay %s", relay) + await self.wait_relay_state(relay, False) + + + async def wait_relay_state( self, relay: int, @@ -534,3 +555,52 @@ class ElicaService: ), power_led=self.input_state(self._config.power_input), ) + + @property + def feedback_ready(self) -> bool: + """True, когда получены состояния всех входов, необходимых для Elica.""" + return not self.missing_feedback_inputs + + + @property + def missing_feedback_inputs(self) -> tuple[int, ...]: + """Возвращает номера входов Elica, состояние которых ещё не получено.""" + required = ( + self._config.speed_1_input, + self._config.speed_2_input, + self._config.speed_3_input, + self._config.speed_4_input, + self._config.power_input, + ) + + return tuple( + input_number + for input_number in required + if not self._received_input_mask & (1 << (input_number - 1)) + ) + + async def wait_feedback_ready( + self, + timeout: float = 3.0, + poll_interval: float = 0.05, + ) -> None: + """Ждёт получения исходного состояния всех входов панели Elica.""" + deadline = asyncio.get_running_loop().time() + timeout + + while not self.feedback_ready: + if not self._running: + raise RuntimeError("Elica service is not running") + + if not self._state.mqtt_connected: + raise RuntimeError("Elica MQTT is not connected") + + if not self._state.device_online: + raise RuntimeError("ESP32 Elica controller is offline") + + if asyncio.get_running_loop().time() >= deadline: + raise TimeoutError( + f"Elica feedback synchronization timeout; " + f"missing inputs: {self.missing_feedback_inputs}" + ) + + await asyncio.sleep(poll_interval) \ No newline at end of file