Compare commits

...

4 Commits

Author SHA1 Message Date
Andrey
fc17b82021 support response for extenders 2021-02-28 15:01:39 +03:00
Andrey
1aeaabfb3c fix errors 2021-02-28 14:50:47 +03:00
Andrey
a0bd8acac0 fix errors 2021-02-28 14:49:38 +03:00
andvikt
c48a3632d2 Update http.py 2021-02-28 13:04:00 +03:00
4 changed files with 39 additions and 19 deletions

View File

@@ -63,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data):
class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
"""Handle a config flow for mega.""" """Handle a config flow for mega."""
VERSION = 14 VERSION = 15
CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
async def async_step_user(self, user_input=None): async def async_step_user(self, user_input=None):

View File

@@ -1,6 +1,19 @@
from dataclasses import dataclass, field from dataclasses import dataclass, field
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
inputs = [
'eact',
'inta',
'misc',
]
selectors = [
'pty',
'm',
'gr',
'd',
'ety',
]
@dataclass(frozen=True, eq=True) @dataclass(frozen=True, eq=True)
class Config: class Config:
@@ -8,21 +21,16 @@ class Config:
m: str = None m: str = None
gr: str = None gr: str = None
d: str = None d: str = None
inta: str = field(compare=False, hash=False, default=None)
ety: str = None ety: str = None
inta: str = field(compare=False, hash=False, default=None)
misc: 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): def parse_config(page: str):
page = BeautifulSoup(page, features="lxml") page = BeautifulSoup(page, features="lxml")
ret = {} ret = {}
for x in [ for x in selectors:
'pty',
'm',
'gr',
'd',
'ety',
]:
v = page.find('select', attrs={'name': x}) v = page.find('select', attrs={'name': x})
if v is None: if v is None:
continue continue
@@ -31,12 +39,10 @@ def parse_config(page: str):
if v: if v:
v = v['value'] v = v['value']
ret[x] = v ret[x] = v
v = page.find('input', attrs={'name': 'inta'}) for x in inputs:
if v: v = page.find('input', attrs={'name': x})
ret['inta'] = v['value'] if v:
v = page.find('input', attrs={'name': 'misc'}) ret[x] = v['value']
if v:
ret['misc'] = v.get('checked', False)
return Config(**ret) return Config(**ret)

View File

@@ -109,8 +109,8 @@ class MegaView(HomeAssistantView):
hub.lg.warning(f'can not find extender for int port {port}') hub.lg.warning(f'can not find extender for int port {port}')
return Response(status=200) return Response(status=200)
for e, v in data.items(): for e, v in data.items():
if e.startswith('ext') in data: if e.startswith('ext'):
idx = e[-1] idx = e[3:]
pt = f'{pt_orig}e{idx}' pt = f'{pt_orig}e{idx}'
data['pt_orig'] = pt_orig data['pt_orig'] = pt_orig
data['value'] = 'ON' if v == '1' else 'OFF' data['value'] = 'ON' if v == '1' else 'OFF'
@@ -118,6 +118,14 @@ class MegaView(HomeAssistantView):
hub.values[pt] = data hub.values[pt] = data
for cb in self.callbacks[hub.id][pt]: for cb in self.callbacks[hub.id][pt]:
cb(data) cb(data)
act = hub.ext_act.get(pt)
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 ret == 'd' and act:
await hub.request(cmd=act)
ret = 'd' if hub.force_d else ''
else: else:
hub.values[port] = data hub.values[port] = data
for cb in self.callbacks[hub.id][port]: for cb in self.callbacks[hub.id][port]:

View File

@@ -82,6 +82,7 @@ class MegaD:
restore_on_restart=False, restore_on_restart=False,
extenders=None, extenders=None,
ext_in=None, ext_in=None,
ext_act=None,
**kwargs, **kwargs,
): ):
"""Initialize.""" """Initialize."""
@@ -98,6 +99,7 @@ class MegaD:
self.http = None self.http = None
self.extenders = extenders or [] self.extenders = extenders or []
self.ext_in = ext_in or {} self.ext_in = ext_in or {}
self.ext_act = ext_act or {}
self.poll_outs = poll_outs self.poll_outs = poll_outs
self.update_all = update_all if update_all is not None else True self.update_all = update_all if update_all is not None else True
self.nports = nports self.nports = nports
@@ -517,6 +519,7 @@ class MegaD:
ret['mqtt_id'] = await self.get_mqtt_id() ret['mqtt_id'] = await self.get_mqtt_id()
ret['extenders'] = extenders = [] ret['extenders'] = extenders = []
ret['ext_in'] = ext_int = {} ret['ext_in'] = ext_int = {}
ret['ext_acts'] = ext_acts = {}
async for port, cfg in self.scan_ports(nports): async for port, cfg in self.scan_ports(nports):
if cfg.pty == "0": if cfg.pty == "0":
ret['binary_sensor'][port].append({}) ret['binary_sensor'][port].append({})
@@ -542,10 +545,13 @@ class MegaD:
for n in range(len(values)): for n in range(len(values)):
ext_page = await self.request(pt=port, ext=n) ext_page = await self.request(pt=port, ext=n)
ext_cfg = parse_config(ext_page) ext_cfg = parse_config(ext_page)
pt = f'{port}e{n}'
if ext_cfg.ety == '1': if ext_cfg.ety == '1':
ret['light'][f'{port}e{n}'].append({}) ret['light'][pt].append({})
elif ext_cfg.ety == '0': elif ext_cfg.ety == '0':
ret['binary_sensor'][f'{port}e{n}'].append({}) if ext_cfg.eact:
ext_acts[pt] = ext_cfg.eact
ret['binary_sensor'][pt].append({})
elif cfg == PCA9685: elif cfg == PCA9685:
extenders.append(port) extenders.append(port)
values = await self.request(pt=port, cmd='get') values = await self.request(pt=port, cmd='get')