diff --git a/.experiment.py b/.experiment.py
index 0ae89f6..cdbe35f 100644
--- a/.experiment.py
+++ b/.experiment.py
@@ -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 = """
+MegaD-2561 by ab-log.ru (fw: 4.48b7)
Config
-- MODS --
XP1
XP2
-- XT2 --
P30 - OUT
P31 - OUT
P32 - IN
P33 - I2C/SCL
P34 - DS
P35 - NC
-- XP5/6 --
P36 - ADC
P37 - NC
+
+MegaD-2561 by ab-log.ru (fw: 4.48b7)
Config
-- MODS --
XP1
XP2
-- XT2 --
P30 - OUT
P31 - OUT
P32 - IN
P33 - I2C/SCL
P34 - DS
P35 - NC
-- XP5/6 --
P36 - ADC
P37 - NC
+MegaD-2561 by
+ab-log.ru
+ (fw: 4.48b7)
+
+Config
+
+-- MODS --
+
+XP1
+
+XP2
+
+-- XT2 --
+
+P30 - OUT
+
+P31 - OUT
+
+P32 - IN
+
+P33 - I2C/SCL
+
+P34 - DS
+
+P35 - NC
+
+-- XP5/6 --
+
+P36 - ADC
+
+P37 - NC
+MegaD-2561 by ab-log.ru (fw: 4.48b7)
Config
-- MODS --
XP1
XP2
-- XT2 --
P30 - OUT
P31 - OUT
P32 - IN
P33 - I2C/SCL
P34 - DS
P35 - NC
-- XP5/6 --
P36 - ADC
P37 - NC
+MegaD-2561 by ab-log.ru (fw: 4.48b7)
Config
-- MODS --
XP1
XP2
-- XT2 --
P30 - OUT
P31 - OUT
P32 - IN
P33 - I2C/SCL
P34 - DS
P35 - NC
-- XP5/6 --
P36 - ADC
P37 - NC
+"""
+print(PATT_FW.search(data).groups()[0])
\ No newline at end of file
diff --git a/custom_components/mega/__init__.py b/custom_components/mega/__init__.py
index 3757f3e..57b53e1 100644
--- a/custom_components/mega/__init__.py
+++ b/custom_components/mega/__init__.py
@@ -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}')
diff --git a/custom_components/mega/config_parser.py b/custom_components/mega/config_parser.py
new file mode 100644
index 0000000..b0f90b4
--- /dev/null
+++ b/custom_components/mega/config_parser.py
@@ -0,0 +1,52 @@
+from dataclasses import dataclass, field
+from bs4 import BeautifulSoup
+
+
+@dataclass(frozen=True, eq=True)
+class Config:
+ pty: str = None
+ m: str = None
+ gr: str = None
+ d: str = None
+ inta: str = field(compare=False, hash=False, default=None)
+ ety: str = None
+ misc: str = field(compare=False, hash=False, default=None)
+
+
+def parse_config(page: str):
+ page = BeautifulSoup(page, features="lxml")
+ ret = {}
+ for x in [
+ 'pty',
+ 'm',
+ 'gr',
+ 'd',
+ 'ety',
+ ]:
+ 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
+ v = page.find('input', attrs={'name': 'inta'})
+ if v:
+ ret['inta'] = v['value']
+ v = page.find('input', attrs={'name': 'misc'})
+ if v:
+ ret['misc'] = v.get('checked', False)
+ 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")
+
diff --git a/custom_components/mega/const.py b/custom_components/mega/const.py
index 478ae88..317660c 100644
--- a/custom_components/mega/const.py
+++ b/custom_components/mega/const.py
@@ -50,3 +50,5 @@ PRESS = 'press'
LUX = 'lux'
SINGLE_CLICK = 'single'
DOUBLE_CLICK = 'double'
+
+PATT_FW = re.compile(r'fw:\s(.+)\)')
\ No newline at end of file
diff --git a/custom_components/mega/entities.py b/custom_components/mega/entities.py
index d4ab7cf..5a7893a 100644
--- a/custom_components/mega/entities.py
+++ b/custom_components/mega/entities.py
@@ -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
+ else:
+ return val
elif val is not None:
+ val = val.get("value")
+ if val is None:
+ return
try:
val = int(val)
return val
@@ -248,9 +262,16 @@ 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)
+ 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 +307,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 +326,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,6 +350,8 @@ 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()
diff --git a/custom_components/mega/http.py b/custom_components/mega/http.py
index fa18c56..c6da5e3 100644
--- a/custom_components/mega/http.py
+++ b/custom_components/mega/http.py
@@ -15,6 +15,8 @@ from .tools import make_ints
from . import hub as h
_LOGGER = logging.getLogger(__name__).getChild('http')
+ext = {f'ext{x}' for x in range(16)}
+
class MegaView(HomeAssistantView):
@@ -93,15 +95,27 @@ 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 set(data).issubset(ext):
+ ret = '' # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
+ for e in ext:
+ if e in data:
+ idx = e[-1]
+ pt = f'{port}e{idx}'
+ data['value'] = 'ON' if data[e] == '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)
+ 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')
diff --git a/custom_components/mega/hub.py b/custom_components/mega/hub.py
index b63d33a..6dfc392 100644
--- a/custom_components/mega/hub.py
+++ b/custom_components/mega/hub.py
@@ -16,10 +16,11 @@ 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
@@ -79,6 +80,7 @@ class MegaD:
allow_hosts: str=None,
protected=True,
restore_on_restart=False,
+ extenders=None,
**kwargs,
):
"""Initialize."""
@@ -93,6 +95,7 @@ class MegaD:
self.http.hubs[mqtt_id] = self
else:
self.http = None
+ self.extenders = extenders or []
self.poll_outs = poll_outs
self.update_all = update_all if update_all is not None else True
self.nports = nports
@@ -127,10 +130,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 +241,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 +270,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:
@@ -432,62 +449,77 @@ 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 = []
+ 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 +531,34 @@ 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)
+ 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)
+ if ext_cfg.ety == '1':
+ ret['light'][f'{port}e{n}'].append({})
+ elif ext_cfg.ety == '0':
+ ret['binary_sensor'][f'{port}e{n}'].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 +568,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:
diff --git a/custom_components/mega/manifest.json b/custom_components/mega/manifest.json
index af5e967..862b7e5 100644
--- a/custom_components/mega/manifest.json
+++ b/custom_components/mega/manifest.json
@@ -15,5 +15,5 @@
"@andvikt"
],
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
- "version": "v0.4.2b1"
+ "version": "v0.5.1b1"
}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index fa54f85..89d85f1 100644
--- a/readme.md
+++ b/readme.md
@@ -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):