jeka/mega_hacs
1
0
Fork 0
mirror of https://github.com/andvikt/mega_hacs.git synced 2025-12-11 00:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix errors

Browse Source
This commit is contained in:
Andrey
2021-02-28 09:46:06 +03:00
parent d0769b5b02
commit 22720a27bd
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
custom_components/mega/http.py
View File

@@ -15,7 +15,11 @@ from .tools import make_ints
from . import hub as h from . import hub as h
_LOGGER = logging.getLogger(__name__).getChild('http') _LOGGER = logging.getLogger(__name__).getChild('http')
ext = {f'ext{x}' for x in range(16)}
def is_ext(data: typing.Dict[str, typing.Any]):
for x in data:
if x.startswith('ext'):
return True
class MegaView(HomeAssistantView): class MegaView(HomeAssistantView):
@@ -95,18 +99,21 @@ class MegaView(HomeAssistantView):
data['mega_id'] = hub.id data['mega_id'] = hub.id
ret = 'd' if hub.force_d else '' ret = 'd' if hub.force_d else ''
if port is not None: if port is not None:
if set(data).issubset(ext): if is_ext(data):
ret = '' # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ ret = '' # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
pt_orig = hub.ext_in.get(port) if port in hub.extenders:
pt_orig = port
else:
pt_orig = hub.ext_in.get(port)
if pt_orig is None: if pt_orig is None:
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 in ext: for e, v in data.items():
if e in data: if e.startswith('ext') in data:
idx = e[-1] idx = e[-1]
pt = f'{pt_orig}e{idx}' pt = f'{pt_orig}e{idx}'
data['pt'] = pt_orig data['pt_orig'] = pt_orig
data['value'] = 'ON' if data[e] == '1' else 'OFF' data['value'] = 'ON' if v == '1' else 'OFF'
data['m'] = 1 if data[e] == '0' else 0 # имитация поведения обычного входа, чтобы события обрабатывались аналогично data['m'] = 1 if data[e] == '0' else 0 # имитация поведения обычного входа, чтобы события обрабатывались аналогично
hub.values[pt] = data hub.values[pt] = data
for cb in self.callbacks[hub.id][pt]: for cb in self.callbacks[hub.id][pt]:

2
custom_components/mega/hub.py
View File

@@ -536,7 +536,7 @@ class MegaD:
]) ])
elif cfg == MCP230: elif cfg == MCP230:
extenders.append(port) extenders.append(port)
ext_int[cfg.inta] = port ext_int[int(cfg.inta)] = port
values = await self.request(pt=port, cmd='get') values = await self.request(pt=port, cmd='get')
values = values.split(';') values = values.split(';')
for n in range(len(values)): for n in range(len(values)):