work: Добавил функционал пульсирующего включения. Т.е. вкл\выкл.
This commit is contained in:
+1
-1
@@ -10,7 +10,7 @@ class ElicaConfig:
|
|||||||
topic: str = "elica"
|
topic: str = "elica"
|
||||||
|
|
||||||
# Длительность виртуального нажатия кнопки
|
# Длительность виртуального нажатия кнопки
|
||||||
pulse_ms: int = 200
|
pulse_ms: int = 300
|
||||||
|
|
||||||
# Физические реле платы ESP32 Relay X8 Modbus.
|
# Физические реле платы ESP32 Relay X8 Modbus.
|
||||||
# OUT1-OUT4 используются для кнопок Elica.
|
# OUT1-OUT4 используются для кнопок Elica.
|
||||||
|
|||||||
+43
-6
@@ -1,11 +1,9 @@
|
|||||||
|
import time
|
||||||
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
import json
|
import paho.mqtt.client as mqtt
|
||||||
import logging
|
|
||||||
from dataclasses import replace
|
from dataclasses import replace
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
import paho.mqtt.client as mqtt
|
|
||||||
|
|
||||||
from .config import ElicaConfig
|
from .config import ElicaConfig
|
||||||
from .models import ElicaState
|
from .models import ElicaState
|
||||||
|
|
||||||
@@ -371,4 +369,43 @@ class ElicaService:
|
|||||||
"topic": self._config.topic,
|
"topic": self._config.topic,
|
||||||
"pulse_ms": self._config.pulse_ms,
|
"pulse_ms": self._config.pulse_ms,
|
||||||
**self._state.to_dict(),
|
**self._state.to_dict(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
@@ -42,29 +42,35 @@ async def main() -> None:
|
|||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
|
|
||||||
for relay in range(1, 9):
|
for relay in range(1, 9):
|
||||||
print(f"\nTesting Relay {relay}...")
|
# print(f"\nTesting Relay {relay}...")
|
||||||
|
#
|
||||||
# ON
|
# # ON
|
||||||
service.set_relay(relay,True,)
|
# 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)
|
await asyncio.sleep(0.5)
|
||||||
|
print(f"Relay {relay} state:", service.relay_state(relay))
|
||||||
state = service.relay_state(relay)
|
assert service.relay_state(relay) is False
|
||||||
|
|
||||||
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("\nAll 8 relays passed MQTT test.")
|
print("\nAll 8 relays passed MQTT test.")
|
||||||
print("\nFinal state:")
|
print("\nFinal state:")
|
||||||
@@ -77,13 +83,13 @@ async def main() -> None:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
print("\nInitial inputs:")
|
# print("\nInitial inputs:")
|
||||||
print(service.state.input_states)
|
# print(service.state.input_states)
|
||||||
|
#
|
||||||
print("\nToggle ESP32 inputs now...")
|
# print("\nToggle ESP32 inputs now...")
|
||||||
for _ in range(15):
|
# for _ in range(15):
|
||||||
await asyncio.sleep(1)
|
# await asyncio.sleep(1)
|
||||||
print(service.state.input_states)
|
# print(service.state.input_states)
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
# На всякий случай гарантированно выключаем все реле.
|
# На всякий случай гарантированно выключаем все реле.
|
||||||
|
|||||||
Reference in New Issue
Block a user