From f6e00842d854f1d1497b943772a432f8172b2aa0 Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Tue, 22 Sep 2026 21:35:10 +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=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=83=D0=BB=D1=8C=D1=81=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=89=D0=B5=D0=B3=D0=BE=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F.=20=D0=A2.=D0=B5.=20=D0=B2=D0=BA=D0=BB\?= =?UTF-8?q?=D0=B2=D1=8B=D0=BA=D0=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/elica/config.py | 2 +- app/elica/service.py | 49 +++++++++++++++++++++--- tests/test_esp32_elica_service.py | 62 +++++++++++++++++-------------- 3 files changed, 78 insertions(+), 35 deletions(-) diff --git a/app/elica/config.py b/app/elica/config.py index b036563..59ead9b 100644 --- a/app/elica/config.py +++ b/app/elica/config.py @@ -10,7 +10,7 @@ class ElicaConfig: topic: str = "elica" # Длительность виртуального нажатия кнопки - pulse_ms: int = 200 + pulse_ms: int = 300 # Физические реле платы ESP32 Relay X8 Modbus. # OUT1-OUT4 используются для кнопок Elica. diff --git a/app/elica/service.py b/app/elica/service.py index 266a24d..03773b4 100644 --- a/app/elica/service.py +++ b/app/elica/service.py @@ -1,11 +1,9 @@ +import time +import asyncio import logging -import json -import logging +import paho.mqtt.client as mqtt from dataclasses import replace from datetime import datetime, timezone - -import paho.mqtt.client as mqtt - from .config import ElicaConfig from .models import ElicaState @@ -371,4 +369,43 @@ class ElicaService: "topic": self._config.topic, "pulse_ms": self._config.pulse_ms, **self._state.to_dict(), - } \ No newline at end of file + } + + async def pulse_relay(self, relay: int, pulse_ms: int | None = None) -> None: + """ + Кратковременно включает реле и затем выключает его. + Используется для эмуляции нажатия кнопок Elica. + """ + if not 1 <= relay <= 8: + raise ValueError("Relay number must be between 1 and 8") + + 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) + await self.wait_relay_state(relay, False) + + async def wait_relay_state( + self, + relay: int, + expected: bool, + timeout: float = 2.0, + ) -> None: + """ + Ждёт подтверждения состояния реле через MQTT. + """ + if not 1 <= relay <= 8: + raise ValueError("Relay number must be between 1 and 8") + + deadline = asyncio.get_running_loop().time() + timeout + + while self.relay_state(relay) != expected: + if asyncio.get_running_loop().time() >= deadline: + state = self.relay_state(relay) + raise TimeoutError( + f"Relay {relay} did not reach state {expected}; current state: {state}" + ) + + await asyncio.sleep(0.02) \ No newline at end of file diff --git a/tests/test_esp32_elica_service.py b/tests/test_esp32_elica_service.py index f120212..009459f 100644 --- a/tests/test_esp32_elica_service.py +++ b/tests/test_esp32_elica_service.py @@ -42,29 +42,35 @@ async def main() -> None: # -------------------------------------------------------------- for relay in range(1, 9): - print(f"\nTesting Relay {relay}...") - - # ON - service.set_relay(relay,True,) + # print(f"\nTesting Relay {relay}...") + # + # # ON + # service.set_relay(relay,True,) + # + # await asyncio.sleep(0.5) + # + # state = service.relay_state(relay) + # + # print(f"Relay {relay} after ON: {state}") + # + # assert state is True, (f"Relay {relay} did not report ON") + # + # # OFF + # service.set_relay(relay,False) + # + # await asyncio.sleep(0.5) + # + # state = service.relay_state(relay) + # + # print(f"Relay {relay} after OFF: {state}") + # + # assert state is False, (f"Relay {relay} did not report OFF") + print(f"Pulse Relay {relay}") + await service.pulse_relay(relay) await asyncio.sleep(0.5) - - state = service.relay_state(relay) - - print(f"Relay {relay} after ON: {state}") - - assert state is True, (f"Relay {relay} did not report ON") - - # OFF - service.set_relay(relay,False) - - await asyncio.sleep(0.5) - - state = service.relay_state(relay) - - print(f"Relay {relay} after OFF: {state}") - - assert state is False, (f"Relay {relay} did not report OFF") + print(f"Relay {relay} state:", service.relay_state(relay)) + assert service.relay_state(relay) is False print("\nAll 8 relays passed MQTT test.") print("\nFinal state:") @@ -77,13 +83,13 @@ async def main() -> None: ) ) - print("\nInitial inputs:") - print(service.state.input_states) - - print("\nToggle ESP32 inputs now...") - for _ in range(15): - await asyncio.sleep(1) - print(service.state.input_states) + # print("\nInitial inputs:") + # print(service.state.input_states) + # + # print("\nToggle ESP32 inputs now...") + # for _ in range(15): + # await asyncio.sleep(1) + # print(service.state.input_states) finally: # На всякий случай гарантированно выключаем все реле.