mirror of
https://github.com/andvikt/mega_hacs.git
synced 2025-12-12 01:24:29 +05:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
22a6f8f444 | ||
|
|
9a53de1d5d | ||
|
|
bd8b07dd90 | ||
|
|
d9b6ba3a50 | ||
|
|
1042592a31 | ||
|
|
137eb8b6ba | ||
|
|
a2f412b89e | ||
|
|
8fa14cdbc5 | ||
|
|
fc17b82021 | ||
|
|
1aeaabfb3c | ||
|
|
a0bd8acac0 | ||
|
c48a3632d2 | ||
|
|
e06ba65ead | ||
|
|
22720a27bd | ||
|
|
d0769b5b02 | ||
|
|
9ae093dd91 | ||
|
|
f88109c3a6 | ||
|
|
8742bb975f | ||
|
|
97da209cf0 |
@@ -1,35 +1,43 @@
|
||||
import asyncio
|
||||
from asyncio import Event, FIRST_COMPLETED
|
||||
import signal
|
||||
import re
|
||||
|
||||
|
||||
stop = Event()
|
||||
loop = asyncio.get_event_loop()
|
||||
|
||||
|
||||
async def handler(
|
||||
reader: asyncio.StreamReader,
|
||||
writer: asyncio.StreamWriter,
|
||||
):
|
||||
await reader.read(100)
|
||||
ans = b'HTTP/1.1 200 OK\r\nContent-Length:1\r\n\r\nd'
|
||||
writer.write(ans)
|
||||
await writer.drain()
|
||||
writer.close()
|
||||
await writer.wait_closed()
|
||||
|
||||
|
||||
async def serve():
|
||||
server = await asyncio.start_server(
|
||||
handler,
|
||||
host='0.0.0.0',
|
||||
port=8888,
|
||||
)
|
||||
async with server:
|
||||
await asyncio.wait((server.serve_forever(), stop.wait()), return_when=FIRST_COMPLETED)
|
||||
|
||||
if __name__ == '__main__':
|
||||
loop.add_signal_handler(
|
||||
signal.SIGINT, stop.set
|
||||
)
|
||||
loop.run_until_complete(serve())
|
||||
PATT_FW = re.compile(r'fw:\s(.+)\)')
|
||||
data = """
|
||||
<html><head></head><body>MegaD-2561 by <a href="http://ab-log.ru">ab-log.ru</a> (fw: 4.48b7)<br><a href="/sec/?cf=1">Config</a><br>-- MODS --<br><a href="/sec/?cf=3">XP1</a><br><a href="/sec/?cf=4">XP2</a><br>-- XT2 --<br><a href="/sec/?pt=30">P30 - OUT</a><br><a href="/sec/?pt=31">P31 - OUT</a><br><a href="/sec/?pt=32">P32 - IN</a><br><a href="/sec/?pt=33">P33 - I2C/SCL</a><br><a href="/sec/?pt=34">P34 - DS</a><br><a href="/sec/?pt=35">P35 - NC</a><br>-- XP5/6 --<br><a href="/sec/?pt=36">P36 - ADC</a><br><a href="/sec/?pt=37">P37 - NC</a></body></html>
|
||||
<head></head>
|
||||
<body>MegaD-2561 by <a href="http://ab-log.ru">ab-log.ru</a> (fw: 4.48b7)<br><a href="/sec/?cf=1">Config</a><br>-- MODS --<br><a href="/sec/?cf=3">XP1</a><br><a href="/sec/?cf=4">XP2</a><br>-- XT2 --<br><a href="/sec/?pt=30">P30 - OUT</a><br><a href="/sec/?pt=31">P31 - OUT</a><br><a href="/sec/?pt=32">P32 - IN</a><br><a href="/sec/?pt=33">P33 - I2C/SCL</a><br><a href="/sec/?pt=34">P34 - DS</a><br><a href="/sec/?pt=35">P35 - NC</a><br>-- XP5/6 --<br><a href="/sec/?pt=36">P36 - ADC</a><br><a href="/sec/?pt=37">P37 - NC</a></body>
|
||||
MegaD-2561 by
|
||||
<a href="http://ab-log.ru">ab-log.ru</a>
|
||||
(fw: 4.48b7)
|
||||
<br>
|
||||
<a href="/sec/?cf=1">Config</a>
|
||||
<br>
|
||||
-- MODS --
|
||||
<br>
|
||||
<a href="/sec/?cf=3">XP1</a>
|
||||
<br>
|
||||
<a href="/sec/?cf=4">XP2</a>
|
||||
<br>
|
||||
-- XT2 --
|
||||
<br>
|
||||
<a href="/sec/?pt=30">P30 - OUT</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=31">P31 - OUT</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=32">P32 - IN</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=33">P33 - I2C/SCL</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=34">P34 - DS</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=35">P35 - NC</a>
|
||||
<br>
|
||||
-- XP5/6 --
|
||||
<br>
|
||||
<a href="/sec/?pt=36">P36 - ADC</a>
|
||||
<br>
|
||||
<a href="/sec/?pt=37">P37 - NC</a>
|
||||
<body>MegaD-2561 by <a href="http://ab-log.ru">ab-log.ru</a> (fw: 4.48b7)<br><a href="/sec/?cf=1">Config</a><br>-- MODS --<br><a href="/sec/?cf=3">XP1</a><br><a href="/sec/?cf=4">XP2</a><br>-- XT2 --<br><a href="/sec/?pt=30">P30 - OUT</a><br><a href="/sec/?pt=31">P31 - OUT</a><br><a href="/sec/?pt=32">P32 - IN</a><br><a href="/sec/?pt=33">P33 - I2C/SCL</a><br><a href="/sec/?pt=34">P34 - DS</a><br><a href="/sec/?pt=35">P35 - NC</a><br>-- XP5/6 --<br><a href="/sec/?pt=36">P36 - ADC</a><br><a href="/sec/?pt=37">P37 - NC</a></body>
|
||||
<html><head></head><body>MegaD-2561 by <a href="http://ab-log.ru">ab-log.ru</a> (fw: 4.48b7)<br><a href="/sec/?cf=1">Config</a><br>-- MODS --<br><a href="/sec/?cf=3">XP1</a><br><a href="/sec/?cf=4">XP2</a><br>-- XT2 --<br><a href="/sec/?pt=30">P30 - OUT</a><br><a href="/sec/?pt=31">P31 - OUT</a><br><a href="/sec/?pt=32">P32 - IN</a><br><a href="/sec/?pt=33">P33 - I2C/SCL</a><br><a href="/sec/?pt=34">P34 - DS</a><br><a href="/sec/?pt=35">P35 - NC</a><br>-- XP5/6 --<br><a href="/sec/?pt=36">P36 - ADC</a><br><a href="/sec/?pt=37">P37 - NC</a></body></html>
|
||||
"""
|
||||
print(PATT_FW.search(data).groups()[0])
|
||||
@@ -47,6 +47,14 @@ CUSTOMIZE_DS2413 = {
|
||||
vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
|
||||
}
|
||||
|
||||
|
||||
def extender(x):
|
||||
if isinstance(x, str) and 'e' in x:
|
||||
return x
|
||||
else:
|
||||
raise ValueError('must has "e" in port name')
|
||||
|
||||
|
||||
CONFIG_SCHEMA = vol.Schema(
|
||||
{
|
||||
DOMAIN: {
|
||||
@@ -58,7 +66,7 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
description='Ответ по умолчанию',
|
||||
default=None
|
||||
): vol.Any(cv.template, None),
|
||||
vol.Optional(int, description='номер порта'): vol.Any(
|
||||
vol.Optional(vol.Any(int, extender), description='номер порта'): vol.Any(
|
||||
CUSTOMIZE_PORT,
|
||||
CUSTOMIZE_DS2413,
|
||||
)
|
||||
@@ -128,6 +136,7 @@ async def get_hub(hass, entry):
|
||||
async def _add_mega(hass: HomeAssistant, entry: ConfigEntry):
|
||||
id = entry.data.get('id', entry.entry_id)
|
||||
hub = await get_hub(hass, entry)
|
||||
hub.fw = await hub.get_fw()
|
||||
hass.data[DOMAIN][id] = hub
|
||||
hass.data[DOMAIN][CONF_ALL][id] = hub
|
||||
if not await hub.authenticate():
|
||||
@@ -173,7 +182,7 @@ async def updater(hass: HomeAssistant, entry: ConfigEntry):
|
||||
async def async_remove_entry(hass, entry) -> None:
|
||||
"""Handle removal of an entry."""
|
||||
id = entry.data.get('id', entry.entry_id)
|
||||
hub: MegaD = hass.data[DOMAIN][id]
|
||||
hub: MegaD = hass.data[DOMAIN].get(id)
|
||||
if hub is None:
|
||||
return
|
||||
_LOGGER.debug(f'remove {id}')
|
||||
|
||||
@@ -20,7 +20,7 @@ from homeassistant.helpers.template import Template
|
||||
from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_CUSTOM, CONF_SKIP, CONF_INVERT, CONF_RESPONSE_TEMPLATE
|
||||
from .entities import MegaPushEntity
|
||||
from .hub import MegaD
|
||||
|
||||
from .tools import int_ignore
|
||||
|
||||
lg = logging.getLogger(__name__)
|
||||
|
||||
@@ -51,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
devices = []
|
||||
customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
|
||||
for port, cfg in config_entry.data.get('binary_sensor', {}).items():
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
c = customize.get(mid, {}).get(port, {})
|
||||
if c.get(CONF_SKIP, False):
|
||||
continue
|
||||
@@ -67,6 +67,10 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
|
||||
super().__init__(*args, **kwargs)
|
||||
self._is_on = None
|
||||
self._attrs = None
|
||||
self._click_task = None
|
||||
|
||||
async def _click(self):
|
||||
await self.customize.get
|
||||
|
||||
@property
|
||||
def state_attributes(self):
|
||||
@@ -78,14 +82,15 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
|
||||
|
||||
@property
|
||||
def is_on(self) -> bool:
|
||||
val = self.mega.values.get(self.port, {}).get("value") \
|
||||
or self.mega.values.get(self.port, {}).get('m')
|
||||
val = self.mega.values.get(self.port, {})
|
||||
if isinstance(val, dict):
|
||||
val = val.get("value", val.get('m'))
|
||||
if val is None and self._state is not None:
|
||||
return self._state == 'ON'
|
||||
elif val is not None:
|
||||
if val in ['ON', 'OFF']:
|
||||
return val == 'ON' if not self.invert else val == 'OFF'
|
||||
else:
|
||||
if val in ['ON', 'OFF', '1', '0']:
|
||||
return val in ['ON', '1'] if not self.invert else val in ['OFF', '0']
|
||||
elif isinstance(val, int):
|
||||
return val != 1 if not self.invert else val == 1
|
||||
|
||||
def _update(self, payload: dict):
|
||||
|
||||
@@ -63,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data):
|
||||
class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
"""Handle a config flow for mega."""
|
||||
|
||||
VERSION = 11
|
||||
VERSION = 17
|
||||
CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
|
||||
|
||||
async def async_step_user(self, user_input=None):
|
||||
@@ -118,7 +118,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
reload = user_input.pop(CONF_RELOAD)
|
||||
cfg = dict(self.config_entry.data)
|
||||
cfg.update(user_input)
|
||||
hub = await get_hub(self.hass, self.config_entry.data)
|
||||
hub = await get_hub(self.hass, cfg)
|
||||
if reload:
|
||||
await hub.start()
|
||||
new = await hub.get_config(nports=user_input.get(CONF_NPORTS, 37))
|
||||
|
||||
58
custom_components/mega/config_parser.py
Normal file
58
custom_components/mega/config_parser.py
Normal file
@@ -0,0 +1,58 @@
|
||||
from dataclasses import dataclass, field
|
||||
from bs4 import BeautifulSoup
|
||||
|
||||
inputs = [
|
||||
'eact',
|
||||
'inta',
|
||||
'misc',
|
||||
]
|
||||
selectors = [
|
||||
'pty',
|
||||
'm',
|
||||
'gr',
|
||||
'd',
|
||||
'ety',
|
||||
]
|
||||
|
||||
|
||||
@dataclass(frozen=True, eq=True)
|
||||
class Config:
|
||||
pty: str = None
|
||||
m: str = None
|
||||
gr: str = None
|
||||
d: str = None
|
||||
ety: str = None
|
||||
inta: str = field(compare=False, hash=False, default=None)
|
||||
misc: str = field(compare=False, hash=False, default=None)
|
||||
eact: str = field(compare=False, hash=False, default=None)
|
||||
|
||||
|
||||
def parse_config(page: str):
|
||||
page = BeautifulSoup(page, features="lxml")
|
||||
ret = {}
|
||||
for x in selectors:
|
||||
v = page.find('select', attrs={'name': x})
|
||||
if v is None:
|
||||
continue
|
||||
else:
|
||||
v = v.find(selected=True)
|
||||
if v:
|
||||
v = v['value']
|
||||
ret[x] = v
|
||||
for x in inputs:
|
||||
v = page.find('input', attrs={'name': x})
|
||||
if v:
|
||||
ret[x] = v['value']
|
||||
return Config(**ret)
|
||||
|
||||
|
||||
DIGITAL_IN = Config(pty="0")
|
||||
RELAY_OUT = Config(pty="1", m="0")
|
||||
PWM_OUT = Config(pty="1", m="1")
|
||||
DS2413 = Config(pty="1", m="2")
|
||||
MCP230 = Config(pty="4", m="1", gr="3", d="20")
|
||||
MCP230_OUT = Config(ety="1")
|
||||
MCP230_IN = Config(ety="0")
|
||||
PCA9685 = Config(pty="4", m="1", gr="3", d="21")
|
||||
OWIRE_BUS = Config(pty="3", d="5")
|
||||
|
||||
@@ -32,6 +32,8 @@ CONF_POLL_OUTS = 'poll_outs'
|
||||
CONF_FORCE_D = 'force_d'
|
||||
CONF_DEF_RESPONSE = 'def_response'
|
||||
CONF_RESTORE_ON_RESTART = 'restore_on_restart'
|
||||
CONF_CLICK_TIME = 'click_time'
|
||||
CONF_LONG_TIME = 'long_time'
|
||||
PLATFORMS = [
|
||||
"light",
|
||||
"switch",
|
||||
@@ -50,3 +52,5 @@ PRESS = 'press'
|
||||
LUX = 'lux'
|
||||
SINGLE_CLICK = 'single'
|
||||
DOUBLE_CLICK = 'double'
|
||||
|
||||
PATT_FW = re.compile(r'fw:\s(.+)\)')
|
||||
@@ -96,7 +96,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
"name": f'{self._mega_id} port {self.port}',
|
||||
"manufacturer": 'ab-log.ru',
|
||||
# "model": self.light.productname,
|
||||
# "sw_version": self.light.swversion,
|
||||
"sw_version": self.mega.fw,
|
||||
"via_device": (DOMAIN, self._mega_id),
|
||||
}
|
||||
|
||||
@@ -214,6 +214,7 @@ class MegaOutPort(MegaPushEntity):
|
||||
def __init__(
|
||||
self,
|
||||
dimmer=False,
|
||||
dimmer_scale=1,
|
||||
*args, **kwargs
|
||||
):
|
||||
super().__init__(
|
||||
@@ -222,6 +223,7 @@ class MegaOutPort(MegaPushEntity):
|
||||
self._brightness = None
|
||||
self._is_on = None
|
||||
self.dimmer = dimmer
|
||||
self.dimmer_scale = dimmer_scale
|
||||
|
||||
# @property
|
||||
# def assumed_state(self) -> bool:
|
||||
@@ -235,10 +237,22 @@ class MegaOutPort(MegaPushEntity):
|
||||
def brightness(self):
|
||||
if not self.dimmer:
|
||||
return
|
||||
val = self.mega.values.get(self.port, {}).get("value")
|
||||
if val is None and self._state is not None:
|
||||
val = self.mega.values.get(self.port, {})
|
||||
if isinstance(val, dict) and len(val) == 0 and self._state is not None:
|
||||
return self._state.attributes.get("brightness")
|
||||
elif isinstance(self.port, str) and 'e' in self.port:
|
||||
if isinstance(val, str):
|
||||
val = safe_int(val)
|
||||
else:
|
||||
val = 0
|
||||
if val == 0:
|
||||
return self._brightness
|
||||
elif isinstance(val, (int, float)):
|
||||
return int(val / self.dimmer_scale)
|
||||
elif val is not None:
|
||||
val = val.get("value")
|
||||
if val is None:
|
||||
return
|
||||
try:
|
||||
val = int(val)
|
||||
return val
|
||||
@@ -248,9 +262,17 @@ class MegaOutPort(MegaPushEntity):
|
||||
@property
|
||||
def is_on(self) -> bool:
|
||||
val = self.mega.values.get(self.port, {})
|
||||
|
||||
if val is None and self._state is not None:
|
||||
if isinstance(val, dict) and len(val) == 0 and self._state is not None:
|
||||
return self._state == 'ON'
|
||||
elif isinstance(self.port, str) and 'e' in self.port and val:
|
||||
if val is None:
|
||||
return
|
||||
if self.dimmer:
|
||||
val = safe_int(val)
|
||||
if val is not None:
|
||||
return val > 0 if not self.invert else val == 0
|
||||
else:
|
||||
return val == 'ON' if not self.invert else val == 'OFF'
|
||||
elif val is not None:
|
||||
val = val.get("value")
|
||||
if not isinstance(val, str) and self.index is not None and self.addr is not None:
|
||||
@@ -286,11 +308,11 @@ class MegaOutPort(MegaPushEntity):
|
||||
|
||||
async def async_turn_on(self, brightness=None, **kwargs) -> None:
|
||||
brightness = brightness or self.brightness or 255
|
||||
|
||||
self._brightness = brightness
|
||||
if self.dimmer and brightness == 0:
|
||||
cmd = 255
|
||||
cmd = 255 * self.dimmer_scale
|
||||
elif self.dimmer:
|
||||
cmd = brightness
|
||||
cmd = brightness * self.dimmer_scale
|
||||
else:
|
||||
cmd = 1 if not self.invert else 0
|
||||
_cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
|
||||
@@ -305,6 +327,11 @@ class MegaOutPort(MegaPushEntity):
|
||||
conv=False,
|
||||
http_cmd='list',
|
||||
)
|
||||
elif isinstance(self.port, str) and 'e' in self.port:
|
||||
if not self.dimmer:
|
||||
self.mega.values[self.port] = 'ON' if not self.invert else 'OFF'
|
||||
else:
|
||||
self.mega.values[self.port] = cmd
|
||||
else:
|
||||
self.mega.values[self.port] = {'value': cmd}
|
||||
await self.get_state()
|
||||
@@ -324,14 +351,18 @@ class MegaOutPort(MegaPushEntity):
|
||||
conv=False,
|
||||
http_cmd='list',
|
||||
)
|
||||
elif isinstance(self.port, str) and 'e' in self.port:
|
||||
self.mega.values[self.port] = 'OFF' if not self.invert else 'ON'
|
||||
else:
|
||||
self.mega.values[self.port] = {'value': cmd}
|
||||
await self.get_state()
|
||||
|
||||
|
||||
def safe_int(v):
|
||||
if v in ['ON', 'OFF']:
|
||||
return None
|
||||
if v == 'ON':
|
||||
return 1
|
||||
elif v == 'OFF':
|
||||
return 0
|
||||
try:
|
||||
return int(v)
|
||||
except (ValueError, TypeError):
|
||||
|
||||
@@ -16,6 +16,12 @@ from . import hub as h
|
||||
_LOGGER = logging.getLogger(__name__).getChild('http')
|
||||
|
||||
|
||||
def is_ext(data: typing.Dict[str, typing.Any]):
|
||||
for x in data:
|
||||
if x.startswith('ext'):
|
||||
return True
|
||||
|
||||
|
||||
class MegaView(HomeAssistantView):
|
||||
|
||||
url = '/mega'
|
||||
@@ -93,15 +99,47 @@ class MegaView(HomeAssistantView):
|
||||
data['mega_id'] = hub.id
|
||||
ret = 'd' if hub.force_d else ''
|
||||
if port is not None:
|
||||
hub.values[port] = data
|
||||
for cb in self.callbacks[hub.id][port]:
|
||||
cb(data)
|
||||
template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
|
||||
if is_ext(data):
|
||||
# ret = '' # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
|
||||
if port in hub.extenders:
|
||||
pt_orig = port
|
||||
else:
|
||||
pt_orig = hub.ext_in.get(port, hub.ext_in.get(str(port)))
|
||||
if pt_orig is None:
|
||||
hub.lg.warning(f'can not find extender for int port {port}, '
|
||||
f'have ext_int: {hub.ext_in}, ext: {hub.extenders}')
|
||||
return Response(status=200)
|
||||
for e, v in data.items():
|
||||
_data = data.copy()
|
||||
if e.startswith('ext'):
|
||||
idx = e[3:]
|
||||
pt = f'{pt_orig}e{idx}'
|
||||
_data['pt_orig'] = pt_orig
|
||||
_data['value'] = 'ON' if v == '1' else 'OFF'
|
||||
_data['m'] = 1 if _data[e] == '0' else 0 # имитация поведения обычного входа, чтобы события обрабатывались аналогично
|
||||
hub.values[pt] = _data
|
||||
for cb in self.callbacks[hub.id][pt]:
|
||||
cb(_data)
|
||||
act = hub.ext_act.get(pt)
|
||||
hub.lg.debug(f'act on port {pt}: {act}, all acts are: {hub.ext_act}')
|
||||
template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
|
||||
if template is not None:
|
||||
template.hass = hass
|
||||
ret = template.async_render(_data)
|
||||
hub.lg.debug(f'response={ret}, template={template}')
|
||||
if ret == 'd' and act:
|
||||
await hub.request(cmd=act)
|
||||
ret = 'd' if hub.force_d else ''
|
||||
else:
|
||||
hub.values[port] = data
|
||||
for cb in self.callbacks[hub.id][port]:
|
||||
cb(data)
|
||||
template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
|
||||
if template is not None:
|
||||
template.hass = hass
|
||||
ret = template.async_render(data)
|
||||
if hub.update_all and update_all:
|
||||
asyncio.create_task(self.later_update(hub))
|
||||
if template is not None:
|
||||
template.hass = hass
|
||||
ret = template.async_render(data)
|
||||
_LOGGER.debug('response %s', ret)
|
||||
Response(body='' if hub.fake_response else ret, content_type='text/plain')
|
||||
|
||||
|
||||
@@ -16,14 +16,15 @@ from homeassistant.const import (
|
||||
)
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||
from .config_parser import parse_config, DS2413, MCP230, MCP230_OUT, MCP230_IN, PCA9685
|
||||
from .const import (
|
||||
TEMP, HUM, PRESS,
|
||||
LUX, PATT_SPLIT, DOMAIN,
|
||||
CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE
|
||||
CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE, PATT_FW
|
||||
)
|
||||
from .entities import set_events_off, BaseMegaEntity, MegaOutPort
|
||||
from .exceptions import CannotConnect, NoPort
|
||||
from .tools import make_ints
|
||||
from .tools import make_ints, int_ignore
|
||||
|
||||
TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
|
||||
HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
|
||||
@@ -79,6 +80,9 @@ class MegaD:
|
||||
allow_hosts: str=None,
|
||||
protected=True,
|
||||
restore_on_restart=False,
|
||||
extenders=None,
|
||||
ext_in=None,
|
||||
ext_acts=None,
|
||||
**kwargs,
|
||||
):
|
||||
"""Initialize."""
|
||||
@@ -93,6 +97,9 @@ class MegaD:
|
||||
self.http.hubs[mqtt_id] = self
|
||||
else:
|
||||
self.http = None
|
||||
self.extenders = extenders or []
|
||||
self.ext_in = ext_in or {}
|
||||
self.ext_act = ext_acts or {}
|
||||
self.poll_outs = poll_outs
|
||||
self.update_all = update_all if update_all is not None else True
|
||||
self.nports = nports
|
||||
@@ -127,10 +134,12 @@ class MegaD:
|
||||
self.updater = DataUpdateCoordinator(
|
||||
hass,
|
||||
self.lg,
|
||||
name="sensors",
|
||||
name="megad",
|
||||
update_method=self.poll,
|
||||
update_interval=timedelta(seconds=self.poll_interval) if self.poll_interval else None,
|
||||
)
|
||||
self.updaters = []
|
||||
self.fw = ''
|
||||
self.notifiers = defaultdict(asyncio.Condition)
|
||||
if not mqtt_id:
|
||||
_id = host.split(".")[-1]
|
||||
@@ -236,6 +245,12 @@ class MegaD:
|
||||
Polling ports
|
||||
"""
|
||||
self.lg.debug('poll')
|
||||
for x in self.extenders:
|
||||
ret = await self._update_extender(x)
|
||||
if not isinstance(ret, dict):
|
||||
self.lg.warning(f'wrong updater result: {ret} from extender {x}')
|
||||
continue
|
||||
self.values.update(ret)
|
||||
if self.mqtt is None:
|
||||
await self.get_all_ports()
|
||||
await self.get_sensors(only_list=True)
|
||||
@@ -259,12 +274,18 @@ class MegaD:
|
||||
_id = _id['value']
|
||||
return _id or 'megad/' + self.host.split('.')[-1]
|
||||
|
||||
async def get_fw(self):
|
||||
data = await self.request()
|
||||
return PATT_FW.search(data).groups()[0]
|
||||
|
||||
async def send_command(self, port=None, cmd=None):
|
||||
return await self.request(pt=port, cmd=cmd)
|
||||
|
||||
async def request(self, **kwargs):
|
||||
cmd = '&'.join([f'{k}={v}' for k, v in kwargs.items() if v is not None])
|
||||
url = f"http://{self.host}/{self.sec}/?{cmd}"
|
||||
url = f"http://{self.host}/{self.sec}"
|
||||
if cmd:
|
||||
url = f"{url}/?{cmd}"
|
||||
self.lg.debug('request: %s', url)
|
||||
async with self._http_lck:
|
||||
async with aiohttp.request("get", url=url) as req:
|
||||
@@ -377,7 +398,7 @@ class MegaD:
|
||||
if port == 'cmd':
|
||||
return
|
||||
try:
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
except:
|
||||
self.lg.warning('can not process %s', msg)
|
||||
return
|
||||
@@ -406,7 +427,7 @@ class MegaD:
|
||||
asyncio.run_coroutine_threadsafe(self._notify(port, value), self.loop)
|
||||
|
||||
def subscribe(self, port, callback):
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
self.lg.debug(
|
||||
f'subscribe %s %s', port, callback
|
||||
)
|
||||
@@ -432,62 +453,79 @@ class MegaD:
|
||||
return await req.text()
|
||||
|
||||
async def scan_port(self, port):
|
||||
async with self.lck:
|
||||
if port in self._scanned:
|
||||
return self._scanned[port]
|
||||
url = f'http://{self.host}/{self.sec}/?pt={port}'
|
||||
self.lg.debug(
|
||||
f'scan port %s: %s', port, url
|
||||
)
|
||||
async with aiohttp.request('get', url) as req:
|
||||
html = await req.text()
|
||||
if req.status != 200:
|
||||
return
|
||||
tree = BeautifulSoup(html, features="lxml")
|
||||
pty = tree.find('select', attrs={'name': 'pty'})
|
||||
if pty is None:
|
||||
return
|
||||
else:
|
||||
pty = pty.find(selected=True)
|
||||
if pty:
|
||||
pty = pty['value']
|
||||
else:
|
||||
return
|
||||
if pty in ['0', '1']:
|
||||
m = tree.find('select', attrs={'name': 'm'})
|
||||
if m:
|
||||
m = m.find(selected=True)['value']
|
||||
self._scanned[port] = (pty, m)
|
||||
return pty, m
|
||||
elif pty == '3':
|
||||
m = tree.find('select', attrs={'name': 'd'})
|
||||
if m:
|
||||
m = m.find(selected=True)['value']
|
||||
self._scanned[port] = (pty, m)
|
||||
return pty, m
|
||||
elif pty in ('2', '4'): # эта часть не очень проработана, тут есть i2c который может работать неправильно
|
||||
m = tree.find('select', attrs={'name': 'd'})
|
||||
if m:
|
||||
m = m.find(selected=True)['value']
|
||||
self._scanned[port] = (pty, m or '0')
|
||||
return pty, m or '0'
|
||||
data = await self.request(pt=port)
|
||||
return parse_config(data)
|
||||
# async with self.lck:
|
||||
# if port in self._scanned:
|
||||
# return self._scanned[port]
|
||||
# url = f'http://{self.host}/{self.sec}/?pt={port}'
|
||||
# self.lg.debug(
|
||||
# f'scan port %s: %s', port, url
|
||||
# )
|
||||
# async with aiohttp.request('get', url) as req:
|
||||
# html = await req.text()
|
||||
# if req.status != 200:
|
||||
# return
|
||||
# tree = BeautifulSoup(html, features="lxml")
|
||||
# pty = tree.find('select', attrs={'name': 'pty'})
|
||||
# if pty is None:
|
||||
# return
|
||||
# else:
|
||||
# pty = pty.find(selected=True)
|
||||
# if pty:
|
||||
# pty = pty['value']
|
||||
# else:
|
||||
# return
|
||||
# if pty in ['0', '1']:
|
||||
# m = tree.find('select', attrs={'name': 'm'})
|
||||
# if m:
|
||||
# m = m.find(selected=True)['value']
|
||||
# self._scanned[port] = (pty, m)
|
||||
# return pty, m
|
||||
# elif pty == '3':
|
||||
# m = tree.find('select', attrs={'name': 'd'})
|
||||
# if m:
|
||||
# m = m.find(selected=True)['value']
|
||||
# self._scanned[port] = (pty, m)
|
||||
# return pty, m
|
||||
# elif pty in ('2', '4'): # эта часть не очень проработана, тут есть i2c который может работать неправильно
|
||||
# m = tree.find('select', attrs={'name': 'd'})
|
||||
# if m:
|
||||
# m = m.find(selected=True)['value']
|
||||
# self._scanned[port] = (pty, m or '0')
|
||||
# return pty, m or '0'
|
||||
|
||||
async def scan_ports(self, nports=37):
|
||||
for x in range(0, nports+1):
|
||||
ret = await self.scan_port(x)
|
||||
if ret:
|
||||
yield [x, *ret]
|
||||
yield x, ret
|
||||
self.nports = nports+1
|
||||
|
||||
async def _update_extender(self, port):
|
||||
"""
|
||||
Обновление mcp230, так же подходит для PCA9685
|
||||
:param port:
|
||||
:return:
|
||||
"""
|
||||
values = await self.request(pt=port, cmd='get')
|
||||
ret = {}
|
||||
for i, x in enumerate(values.split(';')):
|
||||
ret[f'{port}e{i}'] = x
|
||||
return ret
|
||||
|
||||
async def get_config(self, nports=37):
|
||||
ret = defaultdict(lambda: defaultdict(list))
|
||||
ret['mqtt_id'] = await self.get_mqtt_id()
|
||||
async for port, pty, m in self.scan_ports(nports):
|
||||
if pty == "0":
|
||||
ret['extenders'] = extenders = []
|
||||
ret['ext_in'] = ext_int = {}
|
||||
ret['ext_acts'] = ext_acts = {}
|
||||
async for port, cfg in self.scan_ports(nports):
|
||||
if cfg.pty == "0":
|
||||
ret['binary_sensor'][port].append({})
|
||||
elif pty == "1" and (m in ['0', '1', '3'] or m is None):
|
||||
ret['light'][port].append({'dimmer': m == '1'})
|
||||
elif pty == "1" and m == "2":
|
||||
elif cfg.pty == "1" and (cfg.m in ['0', '1', '3'] or cfg.m is None):
|
||||
ret['light'][port].append({'dimmer': cfg.m == '1'})
|
||||
elif cfg == DS2413:
|
||||
# ds2413
|
||||
_data = await self.get_port(port=port, force_http=True, http_cmd='list', conv=False)
|
||||
data = _data.get('value', {})
|
||||
@@ -499,21 +537,39 @@ class MegaD:
|
||||
{"index": 0, "addr": addr, "id_suffix": f'{addr}_a', "http_cmd": 'ds2413'},
|
||||
{"index": 1, "addr": addr, "id_suffix": f'{addr}_b', "http_cmd": 'ds2413'},
|
||||
])
|
||||
elif pty in ('3', '2', '4'):
|
||||
try:
|
||||
http_cmd = 'get'
|
||||
if m == '5' and pty == '3':
|
||||
# 1-wire bus
|
||||
elif cfg == MCP230:
|
||||
extenders.append(port)
|
||||
if cfg.inta:
|
||||
ext_int[int_ignore(cfg.inta)] = port
|
||||
values = await self.request(pt=port, cmd='get')
|
||||
values = values.split(';')
|
||||
for n in range(len(values)):
|
||||
ext_page = await self.request(pt=port, ext=n)
|
||||
ext_cfg = parse_config(ext_page)
|
||||
pt = f'{port}e{n}'
|
||||
if ext_cfg.ety == '1':
|
||||
ret['light'][pt].append({})
|
||||
elif ext_cfg.ety == '0':
|
||||
if ext_cfg.eact:
|
||||
ext_acts[pt] = ext_cfg.eact
|
||||
ret['binary_sensor'][pt].append({})
|
||||
elif cfg == PCA9685:
|
||||
extenders.append(port)
|
||||
values = await self.request(pt=port, cmd='get')
|
||||
values = values.split(';')
|
||||
for n in range(len(values)):
|
||||
ret['light'][f'{port}e{n}'].append({'dimmer': True, 'dimmer_scale': 16})
|
||||
elif cfg.pty in ('3', '2', '4'):
|
||||
http_cmd = 'get'
|
||||
if cfg.d == '5' and cfg.pty == '3':
|
||||
# 1-wire bus
|
||||
values = await self.get_port(port, force_http=True, http_cmd='list')
|
||||
http_cmd = 'list'
|
||||
else:
|
||||
values = await self.get_port(port, force_http=True)
|
||||
if values is None or (isinstance(values, dict) and str(values.get('value')) in ('', 'None')):
|
||||
values = await self.get_port(port, force_http=True, http_cmd='list')
|
||||
http_cmd = 'list'
|
||||
else:
|
||||
values = await self.get_port(port, force_http=True)
|
||||
if values is None or (isinstance(values, dict) and str(values.get('value')) in ('', 'None')):
|
||||
values = await self.get_port(port, force_http=True, http_cmd='list')
|
||||
http_cmd = 'list'
|
||||
except asyncio.TimeoutError:
|
||||
self.lg.warning(f'timout on port {port}')
|
||||
continue
|
||||
self.lg.debug(f'values: %s', values)
|
||||
if values is None:
|
||||
self.lg.warning(f'port {port} is of type sensor but response is None, skipping it')
|
||||
@@ -523,8 +579,8 @@ class MegaD:
|
||||
if isinstance(values, str) and TEMP_PATT.search(values):
|
||||
values = {TEMP: values}
|
||||
elif not isinstance(values, dict):
|
||||
if pty == '4' and m in I2C_DEVICE_TYPES:
|
||||
values = {I2C_DEVICE_TYPES[m]: values}
|
||||
if cfg.pty == '4' and cfg.d in I2C_DEVICE_TYPES:
|
||||
values = {I2C_DEVICE_TYPES.get(cfg.m): values}
|
||||
else:
|
||||
values = {None: values}
|
||||
for key in values:
|
||||
|
||||
@@ -26,6 +26,7 @@ from .const import (
|
||||
CONF_CUSTOM,
|
||||
CONF_SKIP,
|
||||
)
|
||||
from .tools import int_ignore
|
||||
|
||||
lg = logging.getLogger(__name__)
|
||||
|
||||
@@ -61,7 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
devices = []
|
||||
customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
|
||||
for port, cfg in config_entry.data.get('light', {}).items():
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
c = customize.get(mid, {}).get(port, {})
|
||||
if c.get(CONF_SKIP, False) or c.get(CONF_DOMAIN, 'light') != 'light':
|
||||
continue
|
||||
|
||||
@@ -15,5 +15,5 @@
|
||||
"@andvikt"
|
||||
],
|
||||
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
|
||||
"version": "v0.4.2b1"
|
||||
"version": "v0.5.1b2"
|
||||
}
|
||||
@@ -22,6 +22,8 @@ from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE
|
||||
from .hub import MegaD
|
||||
import re
|
||||
|
||||
from .tools import int_ignore
|
||||
|
||||
lg = logging.getLogger(__name__)
|
||||
TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
|
||||
HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
|
||||
@@ -81,7 +83,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
hub: MegaD = hass.data['mega'][mid]
|
||||
devices = []
|
||||
for port, cfg in config_entry.data.get('sensor', {}).items():
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
for data in cfg:
|
||||
hub.lg.debug(f'add sensor on port %s with data %s', port, data)
|
||||
sensor = Mega1WSensor(
|
||||
|
||||
@@ -18,6 +18,7 @@ from homeassistant.core import HomeAssistant
|
||||
from . import hub as h
|
||||
from .entities import MegaOutPort
|
||||
from .const import CONF_DIMMER, CONF_SWITCH, DOMAIN, CONF_CUSTOM, CONF_SKIP
|
||||
from .tools import int_ignore
|
||||
|
||||
_LOGGER = lg = logging.getLogger(__name__)
|
||||
|
||||
@@ -50,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
|
||||
customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
|
||||
for port, cfg in config_entry.data.get('light', {}).items():
|
||||
port = int(port)
|
||||
port = int_ignore(port)
|
||||
c = customize.get(mid, {}).get(port, {})
|
||||
if c.get(CONF_SKIP, False) or c.get(CONF_DOMAIN, 'light') != 'switch':
|
||||
continue
|
||||
|
||||
@@ -10,4 +10,11 @@ def make_ints(d: dict):
|
||||
if 'm' not in d:
|
||||
d['m'] = 0
|
||||
if 'click' not in d:
|
||||
d['click'] = 0
|
||||
d['click'] = 0
|
||||
|
||||
|
||||
def int_ignore(x):
|
||||
try:
|
||||
return int(x)
|
||||
except (TypeError, ValueError):
|
||||
return x
|
||||
@@ -21,6 +21,7 @@
|
||||
`light`, для шим - `light` с поддержкой яркости, для цифровых входов `binary_sensor`, для датчиков
|
||||
`sensor`)
|
||||
- Возможность работы с несколькими megad
|
||||
- Автоматическое восстановление состояний выходов после перезагрузки контроллера
|
||||
- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http) или mqtt (`deprecated`, поддержка mqtt
|
||||
будет выключена в версиях >= 1.0.0, тк в нем нет необходимости)
|
||||
- [События](https://github.com/andvikt/mega_hacs/wiki/События) на двойные/долгие нажатия
|
||||
@@ -28,6 +29,7 @@
|
||||
большого кол-ва команд (например в сценах). Каждая следующая команда отправляется только после получения ответа о
|
||||
выполнении предыдущей.
|
||||
- поддержка [ds2413](https://www.ab-log.ru/smart-house/ethernet/megad-2w) (начиная с версии 0.4.1)
|
||||
- поддержка MCP23008/MCP23017/PCA9685 (начиная с версии 0.5.1)
|
||||
|
||||
## Установка
|
||||
Рекомендованный способ с поддержкой обновлений - [HACS](https://hacs.xyz/docs/installation/installation):
|
||||
|
||||
Reference in New Issue
Block a user