work: Добавил защиту от постоянного нажатия кнопки. В случае исключения всегда отправится команда на отжатие. Также добавил синхронизацию начального состояния вытяжки.

This commit is contained in:
2026-09-22 23:07:40 +03:00
parent 75950a7eae
commit 3b3c7a3f13
2 changed files with 93 additions and 9 deletions
+19 -5
View File
@@ -61,6 +61,7 @@ class ElicaController:
while True: while True:
self._ensure_available() self._ensure_available()
self._ensure_feedback_ready()
state = self.state state = self.state
if predicate(state): if predicate(state):
@@ -76,7 +77,7 @@ class ElicaController:
async def _power_on_locked(self) -> ElicaLogicalState: async def _power_on_locked(self) -> ElicaLogicalState:
"""Включает вытяжку. Вызывается только под self._lock.""" """Включает вытяжку. Вызывается только под self._lock."""
self._ensure_available() self._ensure_ready()
state = self.state state = self.state
if state.power: if state.power:
@@ -91,7 +92,7 @@ class ElicaController:
async def _power_off_locked(self) -> ElicaLogicalState: async def _power_off_locked(self) -> ElicaLogicalState:
"""Выключает вытяжку. Вызывается только под self._lock.""" """Выключает вытяжку. Вызывается только под self._lock."""
self._ensure_available() self._ensure_ready()
state = self.state state = self.state
if not state.power: if not state.power:
@@ -131,7 +132,7 @@ class ElicaController:
raise ValueError("Elica speed must be between 1 and 4") raise ValueError("Elica speed must be between 1 and 4")
async with self._lock: async with self._lock:
self._ensure_available() self._ensure_ready()
state = self.state state = self.state
if not state.power: if not state.power:
@@ -182,7 +183,7 @@ class ElicaController:
Состояние подтверждается по миганию индикатора скорости. Состояние подтверждается по миганию индикатора скорости.
""" """
async with self._lock: async with self._lock:
self._ensure_available() self._ensure_ready()
state = self.state state = self.state
if not enabled and not state.power: if not enabled and not state.power:
@@ -227,5 +228,18 @@ class ElicaController:
поэтому light_on/light_off реализовать достоверно нельзя. поэтому light_on/light_off реализовать достоверно нельзя.
""" """
async with self._lock: async with self._lock:
self._ensure_available() self._ensure_ready()
await self._service.press_light() 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")
+73 -3
View File
@@ -31,6 +31,7 @@ class ElicaService:
self._last_speed = 0 self._last_speed = 0
self._speed_led_off_at: float | None = None self._speed_led_off_at: float | None = None
self._last_blink_at: float | None = None self._last_blink_at: float | None = None
self._received_input_mask = 0
@property @property
@@ -109,6 +110,8 @@ class ElicaService:
logger.info("ESP32 elica MQTT connected") logger.info("ESP32 elica MQTT connected")
self._received_input_mask = 0
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Подписки сервиса # Подписки сервиса
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@@ -139,6 +142,8 @@ class ElicaService:
else: else:
logger.info("ESP32 Elica MQTT disconnected: %s",reason_code) logger.info("ESP32 Elica MQTT disconnected: %s",reason_code)
self._received_input_mask = 0
self._state = replace( self._state = replace(
self._state, self._state,
mqtt_connected=False, mqtt_connected=False,
@@ -293,6 +298,9 @@ class ElicaService:
input_states=tuple(input_states), input_states=tuple(input_states),
last_message_at=datetime.now(timezone.utc), last_message_at=datetime.now(timezone.utc),
) )
self._received_input_mask |= 1 << (input_number - 1)
self._update_panel_tracker() self._update_panel_tracker()
def input_state(self, input_number: int) -> bool: def input_state(self, input_number: int) -> bool:
@@ -457,6 +465,8 @@ class ElicaService:
"pulse_ms": self._config.pulse_ms, "pulse_ms": self._config.pulse_ms,
"panel": self.panel_state.to_dict(), "panel": self.panel_state.to_dict(),
"elica": self.logical_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(), **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 duration_ms = pulse_ms if pulse_ms is not None else self._config.pulse_ms
self.set_relay(relay, True) self.set_relay(relay, True)
await self.wait_relay_state(relay, True)
await asyncio.sleep(duration_ms / 1000) try:
self.set_relay(relay, False) 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) await self.wait_relay_state(relay, False)
async def wait_relay_state( async def wait_relay_state(
self, self,
relay: int, relay: int,
@@ -534,3 +555,52 @@ class ElicaService:
), ),
power_led=self.input_state(self._config.power_input), 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)