mirror of
https://github.com/andvikt/mega_hacs.git
synced 2025-12-12 01:24:29 +05:00
Compare commits
38 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
149d30e921 | ||
|
|
84f677656a | ||
|
|
a0900052dc | ||
|
|
b8d355f412 | ||
|
|
d3f76a88df | ||
|
|
fa2bb2674e | ||
|
|
a1ae4e294b | ||
|
|
81d85ba1ed | ||
|
|
7135bb273e | ||
|
|
7d8554a7aa | ||
|
|
40dcadc109 | ||
|
|
35f99877ca | ||
|
|
6c50b81bff | ||
|
|
c810693ba5 | ||
|
|
1fd321d4c1 | ||
|
|
6732e1b7a2 | ||
|
|
f784c1c261 | ||
|
|
ab572c4db5 | ||
|
|
e55184f565 | ||
|
|
3f74f9739c | ||
|
|
49fcf880d9 | ||
|
|
289f52ef73 | ||
|
|
ce589c97b9 | ||
|
|
22a6f8f444 | ||
|
|
9a53de1d5d | ||
|
|
bd8b07dd90 | ||
|
|
d9b6ba3a50 | ||
|
|
1042592a31 | ||
|
|
137eb8b6ba | ||
|
|
a2f412b89e | ||
|
|
8fa14cdbc5 | ||
|
|
fc17b82021 | ||
|
|
1aeaabfb3c | ||
|
|
a0bd8acac0 | ||
|
c48a3632d2 | ||
|
|
e06ba65ead | ||
|
|
22720a27bd | ||
|
|
d0769b5b02 |
@@ -1,43 +1,3 @@
|
||||
import re
|
||||
import struct
|
||||
|
||||
|
||||
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])
|
||||
print(struct.unpack('!f', bytes.fromhex('435c028f'))[0])
|
||||
@@ -7,7 +7,7 @@ import voluptuous as vol
|
||||
|
||||
from homeassistant.const import (
|
||||
CONF_SCAN_INTERVAL, CONF_ID, CONF_NAME, CONF_DOMAIN,
|
||||
CONF_UNIT_OF_MEASUREMENT, CONF_HOST, CONF_VALUE_TEMPLATE
|
||||
CONF_UNIT_OF_MEASUREMENT, CONF_HOST, CONF_VALUE_TEMPLATE, CONF_DEVICE_CLASS
|
||||
)
|
||||
from homeassistant.core import HomeAssistant, ServiceCall
|
||||
from homeassistant.helpers.service import bind_hass
|
||||
@@ -16,7 +16,7 @@ from homeassistant.components import mqtt
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF_CUSTOM, CONF_SKIP, CONF_PORT_TO_SCAN, \
|
||||
CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
|
||||
CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE
|
||||
CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE, CONF_FORCE_I2C_SCAN, CONF_HEX_TO_FLOAT
|
||||
from .hub import MegaD
|
||||
from .config_flow import ConfigFlow
|
||||
from .http import MegaView
|
||||
@@ -34,6 +34,10 @@ CUSTOMIZE_PORT = {
|
||||
vol.Any(str, {
|
||||
vol.Required(str): str
|
||||
}),
|
||||
vol.Optional(CONF_DEVICE_CLASS):
|
||||
vol.Any(str, {
|
||||
vol.Required(str): str
|
||||
}),
|
||||
vol.Optional(
|
||||
CONF_RESPONSE_TEMPLATE,
|
||||
description='шаблон ответа когда на этот порт приходит'
|
||||
@@ -42,6 +46,8 @@ CUSTOMIZE_PORT = {
|
||||
vol.Optional(CONF_GET_VALUE, default=True): bool,
|
||||
vol.Optional(CONF_CONV_TEMPLATE): cv.template,
|
||||
vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
|
||||
vol.Optional(CONF_FORCE_I2C_SCAN): bool,
|
||||
vol.Optional(CONF_HEX_TO_FLOAT): bool,
|
||||
}
|
||||
CUSTOMIZE_DS2413 = {
|
||||
vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
|
||||
@@ -128,7 +134,7 @@ async def get_hub(hass, entry):
|
||||
break
|
||||
if _mqtt is None:
|
||||
raise Exception('mqtt not configured, please configure mqtt first')
|
||||
hub = MegaD(hass, **data, mqtt=_mqtt, lg=_LOGGER, loop=asyncio.get_event_loop())
|
||||
hub = MegaD(hass, config=entry, **data, mqtt=_mqtt, lg=_LOGGER, loop=asyncio.get_event_loop())
|
||||
hub.mqtt_id = await hub.get_mqtt_id()
|
||||
return hub
|
||||
|
||||
@@ -168,18 +174,14 @@ async def updater(hass: HomeAssistant, entry: ConfigEntry):
|
||||
:param entry:
|
||||
:return:
|
||||
"""
|
||||
hub: MegaD = hass.data[DOMAIN][entry.data[CONF_ID]]
|
||||
hub.poll_interval = entry.options[CONF_SCAN_INTERVAL]
|
||||
hub.port_to_scan = entry.options.get(CONF_PORT_TO_SCAN, 0)
|
||||
entry.data = entry.options
|
||||
for platform in PLATFORMS:
|
||||
await hass.config_entries.async_forward_entry_unload(entry, platform)
|
||||
await async_remove_entry(hass, entry)
|
||||
await async_setup_entry(hass, entry)
|
||||
# hub: MegaD = hass.data[DOMAIN][entry.data[CONF_ID]]
|
||||
# hub.poll_interval = entry.options[CONF_SCAN_INTERVAL]
|
||||
# hub.port_to_scan = entry.options.get(CONF_PORT_TO_SCAN, 0)
|
||||
await hass.config_entries.async_reload(entry.entry_id)
|
||||
return True
|
||||
|
||||
|
||||
async def async_remove_entry(hass, entry) -> None:
|
||||
async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
|
||||
"""Handle removal of an entry."""
|
||||
id = entry.data.get('id', entry.entry_id)
|
||||
hub: MegaD = hass.data[DOMAIN].get(id)
|
||||
@@ -189,12 +191,17 @@ async def async_remove_entry(hass, entry) -> None:
|
||||
_hubs.pop(id, None)
|
||||
hass.data[DOMAIN].pop(id, None)
|
||||
hass.data[DOMAIN][CONF_ALL].pop(id, None)
|
||||
for platform in PLATFORMS:
|
||||
await hass.config_entries.async_forward_entry_unload(entry, platform)
|
||||
task: asyncio.Task = _POLL_TASKS.pop(id, None)
|
||||
if task is not None:
|
||||
task.cancel()
|
||||
if hub is None:
|
||||
return
|
||||
await hub.stop()
|
||||
return True
|
||||
|
||||
async_unload_entry = async_remove_entry
|
||||
|
||||
|
||||
async def async_migrate_entry(hass, config_entry: ConfigEntry):
|
||||
|
||||
@@ -57,6 +57,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
continue
|
||||
hub.lg.debug(f'add binary_sensor on port %s', port)
|
||||
sensor = MegaBinarySensor(mega=hub, port=port, config_entry=config_entry)
|
||||
if '<' in sensor.name:
|
||||
continue
|
||||
devices.append(sensor)
|
||||
async_add_devices(devices)
|
||||
|
||||
@@ -67,6 +69,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):
|
||||
|
||||
@@ -11,7 +11,8 @@ from homeassistant.const import CONF_HOST, CONF_ID, CONF_PASSWORD, CONF_SCAN_INT
|
||||
from homeassistant.core import callback, HomeAssistant
|
||||
from .const import DOMAIN, CONF_PORT_TO_SCAN, CONF_RELOAD, PLATFORMS, CONF_MQTT_INPUTS, \
|
||||
CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS, CONF_FAKE_RESPONSE, CONF_FORCE_D, \
|
||||
CONF_ALLOW_HOSTS, CONF_PROTECTED, CONF_RESTORE_ON_RESTART # pylint:disable=unused-import
|
||||
CONF_ALLOW_HOSTS, CONF_PROTECTED, CONF_RESTORE_ON_RESTART, CONF_UPDATE_TIME, \
|
||||
REMOVE_CONFIG # pylint:disable=unused-import
|
||||
from .hub import MegaD
|
||||
from . import exceptions
|
||||
|
||||
@@ -24,7 +25,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
|
||||
vol.Required(CONF_PASSWORD, default="sec"): str,
|
||||
vol.Optional(CONF_SCAN_INTERVAL, default=0): int,
|
||||
vol.Optional(CONF_POLL_OUTS, default=False): bool,
|
||||
vol.Optional(CONF_PORT_TO_SCAN, default=0): int,
|
||||
# vol.Optional(CONF_PORT_TO_SCAN, default=0): int,
|
||||
vol.Optional(CONF_MQTT_INPUTS, default=False): bool,
|
||||
vol.Optional(CONF_NPORTS, default=37): int,
|
||||
vol.Optional(CONF_UPDATE_ALL, default=True): bool,
|
||||
@@ -33,6 +34,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
|
||||
vol.Optional(CONF_RESTORE_ON_RESTART, default=True): bool,
|
||||
vol.Optional(CONF_PROTECTED, default=True): bool,
|
||||
vol.Optional(CONF_ALLOW_HOSTS, default='::1;127.0.0.1'): str,
|
||||
vol.Optional(CONF_UPDATE_TIME, default=True): bool,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -63,7 +65,7 @@ async def validate_input(hass: core.HomeAssistant, data):
|
||||
class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
"""Handle a config flow for mega."""
|
||||
|
||||
VERSION = 12
|
||||
VERSION = 23
|
||||
CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
|
||||
|
||||
async def async_step_user(self, user_input=None):
|
||||
@@ -82,6 +84,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
await hub.stop()
|
||||
hub.lg.debug(f'config loaded: %s', config)
|
||||
config.update(user_input)
|
||||
config['new_naming'] = True
|
||||
return self.async_create_entry(
|
||||
title=user_input.get(CONF_ID, user_input[CONF_HOST]),
|
||||
data=config,
|
||||
@@ -113,22 +116,20 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
|
||||
async def async_step_init(self, user_input=None):
|
||||
"""Manage the options."""
|
||||
hub = await get_hub(self.hass, self.config_entry.data)
|
||||
new_naming = self.config_entry.data.get('new_naming', False)
|
||||
if user_input is not None:
|
||||
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)
|
||||
if reload:
|
||||
await hub.start()
|
||||
new = await hub.get_config(nports=user_input.get(CONF_NPORTS, 37))
|
||||
await hub.stop()
|
||||
cfg['new_naming'] = new_naming
|
||||
self.config_entry.data = cfg
|
||||
await get_hub(self.hass, cfg)
|
||||
|
||||
if reload:
|
||||
id = self.config_entry.data.get('id', self.config_entry.entry_id)
|
||||
hub: MegaD = self.hass.data[DOMAIN].get(id)
|
||||
await hub.reload(reload_entry=False)
|
||||
|
||||
_LOGGER.debug(f'new config: %s', new)
|
||||
cfg = dict(self.config_entry.data)
|
||||
for x in PLATFORMS:
|
||||
cfg.pop(x, None)
|
||||
cfg.update(new)
|
||||
return self.async_create_entry(
|
||||
title='',
|
||||
data=cfg,
|
||||
@@ -139,7 +140,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
data_schema=vol.Schema({
|
||||
vol.Optional(CONF_SCAN_INTERVAL, default=e.get(CONF_SCAN_INTERVAL, 0)): int,
|
||||
vol.Optional(CONF_POLL_OUTS, default=e.get(CONF_POLL_OUTS, False)): bool,
|
||||
vol.Optional(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
|
||||
# vol.Optional(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
|
||||
vol.Optional(CONF_MQTT_INPUTS, default=e.get(CONF_MQTT_INPUTS, True)): bool,
|
||||
vol.Optional(CONF_NPORTS, default=e.get(CONF_NPORTS, 37)): int,
|
||||
vol.Optional(CONF_RELOAD, default=False): bool,
|
||||
@@ -149,6 +150,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
vol.Optional(CONF_RESTORE_ON_RESTART, default=e.get(CONF_RESTORE_ON_RESTART, False)): bool,
|
||||
vol.Optional(CONF_PROTECTED, default=e.get(CONF_PROTECTED, True)): bool,
|
||||
vol.Optional(CONF_ALLOW_HOSTS, default='::1;127.0.0.1'): str,
|
||||
vol.Optional(CONF_UPDATE_TIME, default=e.get(CONF_UPDATE_TIME, False)): bool,
|
||||
# vol.Optional(CONF_INVERT, default=''): str,
|
||||
}),
|
||||
)
|
||||
|
||||
@@ -1,6 +1,19 @@
|
||||
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:
|
||||
@@ -8,21 +21,17 @@ class Config:
|
||||
m: str = None
|
||||
gr: str = None
|
||||
d: str = None
|
||||
inta: str = field(compare=False, hash=False, default=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)
|
||||
src: BeautifulSoup = 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',
|
||||
]:
|
||||
for x in selectors:
|
||||
v = page.find('select', attrs={'name': x})
|
||||
if v is None:
|
||||
continue
|
||||
@@ -31,13 +40,11 @@ def parse_config(page: str):
|
||||
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)
|
||||
for x in inputs:
|
||||
v = page.find('input', attrs={'name': x})
|
||||
if v:
|
||||
ret[x] = v['value']
|
||||
return Config(**ret, src=page)
|
||||
|
||||
|
||||
DIGITAL_IN = Config(pty="0")
|
||||
|
||||
@@ -32,6 +32,11 @@ 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'
|
||||
CONF_FORCE_I2C_SCAN = 'force_i2c_scan'
|
||||
CONF_UPDATE_TIME = 'update_time'
|
||||
CONF_HEX_TO_FLOAT = 'hex_to_float'
|
||||
PLATFORMS = [
|
||||
"light",
|
||||
"switch",
|
||||
@@ -51,4 +56,15 @@ LUX = 'lux'
|
||||
SINGLE_CLICK = 'single'
|
||||
DOUBLE_CLICK = 'double'
|
||||
|
||||
PATT_FW = re.compile(r'fw:\s(.+)\)')
|
||||
PATT_FW = re.compile(r'fw:\s(.+)\)')
|
||||
|
||||
REMOVE_CONFIG = [
|
||||
'extenders',
|
||||
'ext_in',
|
||||
'ext_acts',
|
||||
'i2c_sensors',
|
||||
'binary_sensor',
|
||||
'light',
|
||||
'i2c',
|
||||
'sensor',
|
||||
]
|
||||
@@ -60,7 +60,8 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
self._lg = None
|
||||
self._unique_id = unique_id or f"mega_{mega.id}_{port}" + \
|
||||
(f"_{id_suffix}" if id_suffix else "")
|
||||
self._name = name or f"{mega.id}_{port}" + \
|
||||
_pt = port if not mega.new_naming else f'{port:02}' if isinstance(port, int) else port
|
||||
self._name = name or f"{mega.id}_{_pt}" + \
|
||||
(f"_{id_suffix}" if id_suffix else "")
|
||||
self._customize: dict = None
|
||||
self.index = index
|
||||
@@ -68,6 +69,13 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
if self.http_cmd == 'ds2413':
|
||||
self.mega.ds2413_ports |= {self.port}
|
||||
|
||||
@property
|
||||
def enabled(self):
|
||||
if '<' in self.name:
|
||||
return False
|
||||
else:
|
||||
return super().enabled
|
||||
|
||||
@property
|
||||
def customize(self):
|
||||
if self.hass is None:
|
||||
@@ -85,6 +93,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
|
||||
@property
|
||||
def device_info(self):
|
||||
_pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
|
||||
return {
|
||||
"identifiers": {
|
||||
# Serial numbers are unique identifiers within a specific domain
|
||||
@@ -93,7 +102,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
"config_entries": [
|
||||
self.config_entry,
|
||||
],
|
||||
"name": f'{self._mega_id} port {self.port}',
|
||||
"name": f'{self._mega_id} port {_pt}',
|
||||
"manufacturer": 'ab-log.ru',
|
||||
# "model": self.light.productname,
|
||||
"sw_version": self.mega.fw,
|
||||
@@ -114,7 +123,8 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
||||
def name(self):
|
||||
c = self.customize.get(CONF_NAME)
|
||||
if not isinstance(c, str):
|
||||
c = self._name or f"{self.mega.id}_p{self.port}"
|
||||
_pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
|
||||
c = self._name or f"{self.mega.id}_p{_pt}"
|
||||
return c
|
||||
|
||||
@property
|
||||
@@ -147,6 +157,8 @@ class MegaPushEntity(BaseMegaEntity):
|
||||
|
||||
def __update(self, value: dict):
|
||||
self._update(value)
|
||||
if self.hass is None:
|
||||
return
|
||||
self.async_write_ha_state()
|
||||
self.lg.debug(f'state after update %s', self.state)
|
||||
if self.mega.mqtt_inputs and not _events_on:
|
||||
@@ -318,7 +330,7 @@ class MegaOutPort(MegaPushEntity):
|
||||
_cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
|
||||
if self.addr:
|
||||
_cmd['addr'] = self.addr
|
||||
await self.mega.request(**_cmd)
|
||||
await self.mega.request(**_cmd, priority=-1)
|
||||
if self.index is not None:
|
||||
# обновление текущего стейта для ds2413
|
||||
await self.mega.get_port(
|
||||
@@ -342,7 +354,7 @@ class MegaOutPort(MegaPushEntity):
|
||||
_cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
|
||||
if self.addr:
|
||||
_cmd['addr'] = self.addr
|
||||
await self.mega.request(**_cmd)
|
||||
await self.mega.request(**_cmd, priority=-1)
|
||||
if self.index is not None:
|
||||
# обновление текущего стейта для ds2413
|
||||
await self.mega.get_port(
|
||||
|
||||
@@ -15,7 +15,11 @@ 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)}
|
||||
|
||||
def is_ext(data: typing.Dict[str, typing.Any]):
|
||||
for x in data:
|
||||
if x.startswith('ext'):
|
||||
return True
|
||||
|
||||
|
||||
class MegaView(HomeAssistantView):
|
||||
@@ -73,7 +77,11 @@ class MegaView(HomeAssistantView):
|
||||
if hub is None:
|
||||
_LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
|
||||
if hub is None and request.remote in ['::1', '127.0.0.1']:
|
||||
hub = self.hubs.get('__def')
|
||||
try:
|
||||
hub = list(self.hubs.values())[0]
|
||||
except IndexError:
|
||||
_LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
|
||||
return Response(status=400)
|
||||
elif hub is None:
|
||||
return Response(status=400)
|
||||
data = dict(request.query)
|
||||
@@ -83,8 +91,10 @@ class MegaView(HomeAssistantView):
|
||||
)
|
||||
_LOGGER.debug(f"Request: %s from '%s'", data, request.remote)
|
||||
make_ints(data)
|
||||
if data.get('st') == '1' and hub.restore_on_restart:
|
||||
asyncio.create_task(self.later_restore(hub))
|
||||
if data.get('st') == '1':
|
||||
hass.async_create_task(hub.reload())
|
||||
if hub.restore_on_restart:
|
||||
hass.async_create_task(self.later_restore(hub))
|
||||
return Response(status=200)
|
||||
port = data.get('pt')
|
||||
data = data.copy()
|
||||
@@ -95,17 +105,37 @@ class MegaView(HomeAssistantView):
|
||||
data['mega_id'] = hub.id
|
||||
ret = 'd' if hub.force_d else ''
|
||||
if port is not None:
|
||||
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
|
||||
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)
|
||||
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.replace(':3', f':{v}'))
|
||||
ret = 'd' if hub.force_d else ''
|
||||
else:
|
||||
hub.values[port] = data
|
||||
for cb in self.callbacks[hub.id][port]:
|
||||
@@ -139,5 +169,4 @@ class MegaView(HomeAssistantView):
|
||||
async def later_update(self, hub):
|
||||
await asyncio.sleep(1)
|
||||
_LOGGER.debug('force update')
|
||||
await hub.updater.async_refresh()
|
||||
|
||||
await hub.updater.async_refresh()
|
||||
@@ -10,6 +10,7 @@ import json
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from homeassistant.components import mqtt
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import (
|
||||
DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE,
|
||||
DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
|
||||
@@ -20,11 +21,13 @@ from .config_parser import parse_config, DS2413, MCP230, MCP230_OUT, MCP230_IN,
|
||||
from .const import (
|
||||
TEMP, HUM, PRESS,
|
||||
LUX, PATT_SPLIT, DOMAIN,
|
||||
CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE, PATT_FW
|
||||
CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE, PATT_FW, CONF_FORCE_I2C_SCAN,
|
||||
REMOVE_CONFIG
|
||||
)
|
||||
from .entities import set_events_off, BaseMegaEntity, MegaOutPort
|
||||
from .exceptions import CannotConnect, NoPort
|
||||
from .tools import make_ints, int_ignore
|
||||
from .i2c import parse_scan_page
|
||||
from .tools import make_ints, int_ignore, PriorityLock
|
||||
|
||||
TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
|
||||
HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
|
||||
@@ -68,6 +71,7 @@ class MegaD:
|
||||
mqtt: mqtt.MQTT,
|
||||
lg: logging.Logger,
|
||||
id: str,
|
||||
config: ConfigEntry = None,
|
||||
mqtt_inputs: bool = True,
|
||||
mqtt_id: str = None,
|
||||
scan_interval=60,
|
||||
@@ -81,9 +85,15 @@ class MegaD:
|
||||
protected=True,
|
||||
restore_on_restart=False,
|
||||
extenders=None,
|
||||
ext_in=None,
|
||||
ext_acts=None,
|
||||
i2c_sensors=None,
|
||||
new_naming=False,
|
||||
update_time=False,
|
||||
**kwargs,
|
||||
):
|
||||
"""Initialize."""
|
||||
self.config = config
|
||||
if mqtt_inputs is None or mqtt_inputs == 'None' or mqtt_inputs is False:
|
||||
self.http = hass.data.get(DOMAIN, {}).get(CONF_HTTP)
|
||||
if not self.http is None:
|
||||
@@ -95,7 +105,12 @@ class MegaD:
|
||||
self.http.hubs[mqtt_id] = self
|
||||
else:
|
||||
self.http = None
|
||||
self.new_naming = new_naming
|
||||
self.extenders = extenders or []
|
||||
self.ext_in = ext_in or {}
|
||||
self.ext_act = ext_acts or {}
|
||||
self.i2c_sensors = i2c_sensors or []
|
||||
self._update_time = update_time
|
||||
self.poll_outs = poll_outs
|
||||
self.update_all = update_all if update_all is not None else True
|
||||
self.nports = nports
|
||||
@@ -109,7 +124,7 @@ class MegaD:
|
||||
self.id = id
|
||||
self.lck = asyncio.Lock()
|
||||
self.last_long = {}
|
||||
self._http_lck = asyncio.Lock()
|
||||
self._http_lck = PriorityLock()
|
||||
self._notif_lck = asyncio.Lock()
|
||||
self.cnd = asyncio.Condition()
|
||||
self.online = True
|
||||
@@ -241,6 +256,14 @@ class MegaD:
|
||||
Polling ports
|
||||
"""
|
||||
self.lg.debug('poll')
|
||||
if self._update_time:
|
||||
await self.update_time()
|
||||
for x in self.i2c_sensors:
|
||||
if not isinstance(x, dict):
|
||||
continue
|
||||
ret = await self._update_i2c(x)
|
||||
if isinstance(ret, dict):
|
||||
self.values.update(ret)
|
||||
for x in self.extenders:
|
||||
ret = await self._update_extender(x)
|
||||
if not isinstance(ret, dict):
|
||||
@@ -254,8 +277,8 @@ class MegaD:
|
||||
await self.get_all_ports(check_skip=True)
|
||||
elif len(self.sensors) > 0:
|
||||
await self.get_sensors()
|
||||
else:
|
||||
await self.get_port(self.port_to_scan)
|
||||
# else:
|
||||
# await self.get_port(self.port_to_scan)
|
||||
await self._get_ds2413()
|
||||
return self.values
|
||||
|
||||
@@ -277,13 +300,13 @@ class MegaD:
|
||||
async def send_command(self, port=None, cmd=None):
|
||||
return await self.request(pt=port, cmd=cmd)
|
||||
|
||||
async def request(self, **kwargs):
|
||||
async def request(self, priority=0, **kwargs):
|
||||
cmd = '&'.join([f'{k}={v}' for k, v in kwargs.items() if v is not None])
|
||||
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 self._http_lck(priority):
|
||||
async with aiohttp.request("get", url=url) as req:
|
||||
if req.status != 200:
|
||||
self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
|
||||
@@ -451,45 +474,6 @@ class MegaD:
|
||||
async def scan_port(self, port):
|
||||
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):
|
||||
@@ -510,11 +494,36 @@ class MegaD:
|
||||
ret[f'{port}e{i}'] = x
|
||||
return ret
|
||||
|
||||
async def _update_i2c(self, params):
|
||||
"""
|
||||
Обновление портов i2c
|
||||
:param params: параметры url
|
||||
:return:
|
||||
"""
|
||||
_params = tuple(params.items())
|
||||
delay = None
|
||||
if 'delay' in params:
|
||||
delay = params.pop('delay')
|
||||
ret = {
|
||||
_params: await self.request(**params)
|
||||
}
|
||||
self.lg.debug('i2c response: %s', ret)
|
||||
if delay:
|
||||
self.lg.debug('delay %s', delay)
|
||||
await asyncio.sleep(delay)
|
||||
return ret
|
||||
|
||||
async def get_config(self, nports=37):
|
||||
ret = defaultdict(lambda: defaultdict(list))
|
||||
ret['mqtt_id'] = await self.get_mqtt_id()
|
||||
ret['extenders'] = extenders = []
|
||||
ret['ext_in'] = ext_int = {}
|
||||
ret['ext_acts'] = ext_acts = {}
|
||||
ret['i2c_sensors'] = i2c_sensors = []
|
||||
async for port, cfg in self.scan_ports(nports):
|
||||
_cust = self.customize.get(port)
|
||||
if not isinstance(_cust, dict):
|
||||
_cust = {}
|
||||
if cfg.pty == "0":
|
||||
ret['binary_sensor'][port].append({})
|
||||
elif cfg.pty == "1" and (cfg.m in ['0', '1', '3'] or cfg.m is None):
|
||||
@@ -533,21 +542,40 @@ class MegaD:
|
||||
])
|
||||
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 not self.new_naming else f'{port:02}e{n:02}'
|
||||
if ext_cfg.ety == '1':
|
||||
ret['light'][f'{port}e{n}'].append({})
|
||||
ret['light'][pt].append({})
|
||||
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:
|
||||
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})
|
||||
pt = f'{port}e{n}' if not self.new_naming else f'{port:02}e{n:02}'
|
||||
ret['light'][pt].append({'dimmer': True, 'dimmer_scale': 16})
|
||||
elif cfg.pty == '4' and (cfg.gr == '0' or _cust.get(CONF_FORCE_I2C_SCAN)):
|
||||
# i2c в режиме ANY
|
||||
scan = cfg.src.find('a', text='I2C Scan')
|
||||
self.lg.debug(f'find scan link: %s', scan)
|
||||
if scan is not None:
|
||||
page = await self.request(pt=port, cmd='scan')
|
||||
req, parsed = parse_scan_page(page)
|
||||
self.lg.debug(f'scan results: %s', (req, parsed))
|
||||
ret['i2c'][port].extend(parsed)
|
||||
i2c_sensors.extend(req)
|
||||
elif cfg.pty == '4' and cfg.m == '2':
|
||||
# scl исключаем из сканирования
|
||||
continue
|
||||
elif cfg.pty in ('3', '2', '4'):
|
||||
http_cmd = 'get'
|
||||
if cfg.d == '5' and cfg.pty == '3':
|
||||
@@ -591,4 +619,19 @@ class MegaD:
|
||||
else:
|
||||
await x.async_turn_off()
|
||||
|
||||
async def update_time(self):
|
||||
await self.request(
|
||||
cf=7,
|
||||
stime=datetime.now().strftime('%H:%M:%S')
|
||||
)
|
||||
|
||||
async def reload(self, reload_entry=True):
|
||||
new = await self.get_config(nports=self.nports)
|
||||
self.lg.debug(f'new config: %s', new)
|
||||
cfg = dict(self.config.data)
|
||||
for x in REMOVE_CONFIG:
|
||||
cfg.pop(x, None)
|
||||
cfg.update(new)
|
||||
self.config.data = cfg
|
||||
if reload_entry:
|
||||
await self.hass.config_entries.async_reload(self.config.entry_id)
|
||||
|
||||
118
custom_components/mega/i2c.py
Normal file
118
custom_components/mega/i2c.py
Normal file
@@ -0,0 +1,118 @@
|
||||
from dataclasses import dataclass, field
|
||||
from urllib.parse import parse_qsl, urlparse
|
||||
from bs4 import BeautifulSoup
|
||||
from homeassistant.const import (
|
||||
DEVICE_CLASS_HUMIDITY,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
DEVICE_CLASS_ILLUMINANCE,
|
||||
DEVICE_CLASS_PRESSURE,
|
||||
)
|
||||
|
||||
|
||||
def parse_scan_page(page: str):
|
||||
ret = []
|
||||
req = []
|
||||
page = BeautifulSoup(page, features="lxml")
|
||||
for x in page.find_all('a'):
|
||||
params = x.get('href')
|
||||
if params is None:
|
||||
continue
|
||||
params = dict(parse_qsl(urlparse(params).query))
|
||||
dev = params.get('i2c_dev')
|
||||
if dev is None:
|
||||
continue
|
||||
classes = i2c_classes.get(dev, [])
|
||||
for i, c in enumerate(classes):
|
||||
if c is Skip:
|
||||
continue
|
||||
elif c is Request:
|
||||
req.append(params)
|
||||
continue
|
||||
elif isinstance(c, Request):
|
||||
if c.delay:
|
||||
params = params.copy()
|
||||
params['delay'] = c.delay
|
||||
req.append(params)
|
||||
continue
|
||||
elif isinstance(c, tuple):
|
||||
suffix, c = c
|
||||
elif isinstance(c, str):
|
||||
suffix = c
|
||||
else:
|
||||
suffix = ''
|
||||
if 'addr' in params:
|
||||
suffix += f"_{params['addr']}" if suffix else str(params['addr'])
|
||||
if suffix:
|
||||
_dev = f'{dev}_{suffix}'
|
||||
else:
|
||||
_dev = dev
|
||||
params = params.copy()
|
||||
if i > 0:
|
||||
params['i2c_par'] = i
|
||||
ret.append({
|
||||
'id_suffix': _dev,
|
||||
'device_class': c,
|
||||
'params': params,
|
||||
})
|
||||
req.append(params)
|
||||
return req, ret
|
||||
|
||||
|
||||
class Skip:
|
||||
pass
|
||||
|
||||
|
||||
@dataclass
|
||||
class Request:
|
||||
delay: float = None
|
||||
|
||||
|
||||
i2c_classes = {
|
||||
'htu21d': [
|
||||
DEVICE_CLASS_HUMIDITY,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
],
|
||||
'sht31': [
|
||||
DEVICE_CLASS_HUMIDITY,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
],
|
||||
'max44009': [
|
||||
DEVICE_CLASS_ILLUMINANCE
|
||||
],
|
||||
'bh1750': [
|
||||
DEVICE_CLASS_ILLUMINANCE
|
||||
],
|
||||
'tsl2591': [
|
||||
DEVICE_CLASS_ILLUMINANCE
|
||||
],
|
||||
'bmp180': [
|
||||
DEVICE_CLASS_PRESSURE,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
],
|
||||
'bmx280': [
|
||||
DEVICE_CLASS_PRESSURE,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
DEVICE_CLASS_HUMIDITY
|
||||
],
|
||||
'mlx90614': [
|
||||
Skip,
|
||||
('temp', DEVICE_CLASS_TEMPERATURE),
|
||||
('object', DEVICE_CLASS_TEMPERATURE),
|
||||
],
|
||||
'ptsensor': [
|
||||
Skip,
|
||||
Request(delay=1), # запрос на измерение
|
||||
DEVICE_CLASS_PRESSURE,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
],
|
||||
'mcp9600': [
|
||||
DEVICE_CLASS_TEMPERATURE, # термопара
|
||||
DEVICE_CLASS_TEMPERATURE, # сенсор встроенный в микросхему
|
||||
],
|
||||
't67xx': [
|
||||
None # для co2 нет класса в HA
|
||||
],
|
||||
'tmp117': [
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
]
|
||||
}
|
||||
@@ -69,6 +69,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
for data in cfg:
|
||||
hub.lg.debug(f'add light on port %s with data %s', port, data)
|
||||
light = MegaLight(mega=hub, port=port, config_entry=config_entry, **data)
|
||||
if '<' in light.name:
|
||||
continue
|
||||
devices.append(light)
|
||||
async_add_devices(devices)
|
||||
|
||||
|
||||
@@ -15,5 +15,5 @@
|
||||
"@andvikt"
|
||||
],
|
||||
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
|
||||
"version": "v0.5.1b2"
|
||||
"version": "v0.6.3b1"
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
"""Platform for light integration."""
|
||||
import logging
|
||||
import voluptuous as vol
|
||||
import struct
|
||||
|
||||
from homeassistant.components.sensor import (
|
||||
PLATFORM_SCHEMA as SENSOR_SCHEMA,
|
||||
@@ -14,11 +15,12 @@ from homeassistant.const import (
|
||||
CONF_UNIQUE_ID,
|
||||
CONF_ID,
|
||||
CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE,
|
||||
CONF_DEVICE_CLASS,
|
||||
)
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.template import Template
|
||||
from .entities import MegaPushEntity
|
||||
from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE
|
||||
from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT
|
||||
from .hub import MegaD
|
||||
import re
|
||||
|
||||
@@ -82,21 +84,54 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
mid = config_entry.data[CONF_ID]
|
||||
hub: MegaD = hass.data['mega'][mid]
|
||||
devices = []
|
||||
for port, cfg in config_entry.data.get('sensor', {}).items():
|
||||
port = int_ignore(port)
|
||||
for data in cfg:
|
||||
hub.lg.debug(f'add sensor on port %s with data %s', port, data)
|
||||
sensor = Mega1WSensor(
|
||||
mega=hub,
|
||||
port=port,
|
||||
config_entry=config_entry,
|
||||
**data,
|
||||
)
|
||||
devices.append(sensor)
|
||||
for tp in ['sensor', 'i2c']:
|
||||
for port, cfg in config_entry.data.get(tp, {}).items():
|
||||
port = int_ignore(port)
|
||||
for data in cfg:
|
||||
hub.lg.debug(f'add sensor on port %s with data %s', port, data)
|
||||
sensor = _constructors[tp](
|
||||
mega=hub,
|
||||
port=port,
|
||||
config_entry=config_entry,
|
||||
**data,
|
||||
)
|
||||
if '<' in sensor.name:
|
||||
continue
|
||||
devices.append(sensor)
|
||||
|
||||
async_add_devices(devices)
|
||||
|
||||
|
||||
class MegaI2C(MegaPushEntity):
|
||||
|
||||
def __init__(self, *args, device_class: str, params: dict, **kwargs):
|
||||
self._device_class = device_class
|
||||
self._params = tuple(params.items())
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def device_class(self):
|
||||
return self._device_class
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
# self.lg.debug(f'get % all states: %', self._params, self.mega.values)
|
||||
ret = self.mega.values.get(self._params)
|
||||
if self.customize.get(CONF_HEX_TO_FLOAT):
|
||||
try:
|
||||
ret = struct.unpack('!f', bytes.fromhex('41973333'))[0]
|
||||
except:
|
||||
self.lg.warning(f'could not convert {ret} form hex to float')
|
||||
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
||||
if tmpl is not None and self.hass is not None:
|
||||
tmpl.hass = self.hass
|
||||
ret = tmpl.async_render({'value': ret})
|
||||
return ret
|
||||
|
||||
@property
|
||||
def device_class(self):
|
||||
return self._device_class
|
||||
|
||||
|
||||
class Mega1WSensor(MegaPushEntity):
|
||||
|
||||
def __init__(
|
||||
@@ -141,7 +176,15 @@ class Mega1WSensor(MegaPushEntity):
|
||||
|
||||
@property
|
||||
def device_class(self):
|
||||
return self._device_class
|
||||
_u = self.customize.get(CONF_DEVICE_CLASS, None)
|
||||
if _u is None:
|
||||
return self._device_class
|
||||
elif isinstance(_u, str):
|
||||
return _u
|
||||
elif isinstance(_u, dict) and self.key in _u:
|
||||
return _u[self.key]
|
||||
else:
|
||||
return self._device_class
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
@@ -165,6 +208,11 @@ class Mega1WSensor(MegaPushEntity):
|
||||
ret = str(ret)
|
||||
except:
|
||||
ret = None
|
||||
if self.customize.get(CONF_HEX_TO_FLOAT):
|
||||
try:
|
||||
ret = struct.unpack('!f', bytes.fromhex(ret))[0]
|
||||
except:
|
||||
self.lg.warning(f'could not convert {ret} form hex to float')
|
||||
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
||||
if tmpl is not None and self.hass is not None:
|
||||
tmpl.hass = self.hass
|
||||
@@ -177,4 +225,10 @@ class Mega1WSensor(MegaPushEntity):
|
||||
c = self.customize.get(CONF_NAME, {})
|
||||
if isinstance(c, dict):
|
||||
c = c.get(self.key)
|
||||
return c or n
|
||||
return c or n
|
||||
|
||||
|
||||
_constructors = {
|
||||
'sensor': Mega1WSensor,
|
||||
'i2c': MegaI2C,
|
||||
}
|
||||
@@ -20,7 +20,9 @@
|
||||
"protected": "[%key:common::config_flow::data::protected%]",
|
||||
"allow_hosts": "[%key:common::config_flow::data::allow_hosts%]",
|
||||
"restore_on_restart": "[%key:common::config_flow::data::restore_on_restart%]",
|
||||
"poll_outs": "[%key:common::config_flow::data::poll_outs%]"
|
||||
"poll_outs": "[%key:common::config_flow::data::poll_outs%]",
|
||||
"update_time": "[%key:common::config_flow::data::update_time%]"
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -58,6 +58,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
||||
for data in cfg:
|
||||
hub.lg.debug(f'add switch on port %s with data %s', port, data)
|
||||
light = MegaSwitch(mega=hub, port=port, config_entry=config_entry, **data)
|
||||
if '<' in light.name:
|
||||
continue
|
||||
devices.append(light)
|
||||
async_add_devices(devices)
|
||||
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
import asyncio
|
||||
import itertools
|
||||
from heapq import heappush
|
||||
from contextlib import asynccontextmanager
|
||||
|
||||
|
||||
_params = ['m', 'click', 'cnt', 'pt']
|
||||
|
||||
|
||||
@@ -17,4 +23,95 @@ def int_ignore(x):
|
||||
try:
|
||||
return int(x)
|
||||
except (TypeError, ValueError):
|
||||
return x
|
||||
return x
|
||||
|
||||
|
||||
class PriorityLock(asyncio.Lock):
|
||||
"""
|
||||
You can acquire lock with some kind of priority in mind, so that locks with higher priority will be released first.
|
||||
priority can be set with lck.acquire(1)
|
||||
or by using context manager:
|
||||
>>> lck = PriorityLock()
|
||||
... async with lck(1):
|
||||
... # do something
|
||||
"""
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self._cnt = itertools.count()
|
||||
|
||||
def __call__(self, priority=0):
|
||||
return self._with_priority(priority)
|
||||
|
||||
@asynccontextmanager
|
||||
async def _with_priority(self, p):
|
||||
await self.acquire(p)
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
self.release()
|
||||
|
||||
async def acquire(self, priority=0) -> bool:
|
||||
"""Acquire a lock.
|
||||
|
||||
This method blocks until the lock is unlocked, then sets it to
|
||||
locked and returns True.
|
||||
"""
|
||||
if (not self._locked and (self._waiters is None or
|
||||
all(w.cancelled() for _, _, w in self._waiters))):
|
||||
self._locked = True
|
||||
return True
|
||||
|
||||
if self._waiters is None:
|
||||
self._waiters = []
|
||||
|
||||
fut = self._loop.create_future()
|
||||
cnt = next(self._cnt)
|
||||
heappush(self._waiters, (priority, cnt, fut))
|
||||
|
||||
# Finally block should be called before the CancelledError
|
||||
# handling as we don't want CancelledError to call
|
||||
# _wake_up_first() and attempt to wake up itself.
|
||||
try:
|
||||
try:
|
||||
await fut
|
||||
finally:
|
||||
self._waiters.remove((priority, cnt, fut))
|
||||
except asyncio.exceptions.CancelledError:
|
||||
if not self._locked:
|
||||
self._wake_up_first()
|
||||
raise
|
||||
|
||||
self._locked = True
|
||||
return True
|
||||
|
||||
def release(self):
|
||||
"""Release a lock.
|
||||
|
||||
When the lock is locked, reset it to unlocked, and return.
|
||||
If any other coroutines are blocked waiting for the lock to become
|
||||
unlocked, allow exactly one of them to proceed.
|
||||
|
||||
When invoked on an unlocked lock, a RuntimeError is raised.
|
||||
|
||||
There is no return value.
|
||||
"""
|
||||
if self._locked:
|
||||
self._locked = False
|
||||
self._wake_up_first()
|
||||
else:
|
||||
raise RuntimeError('Lock is not acquired.')
|
||||
|
||||
def _wake_up_first(self):
|
||||
"""Wake up the first waiter if it isn't done."""
|
||||
if not self._waiters:
|
||||
return
|
||||
try:
|
||||
_, _, fut = self._waiters[0]
|
||||
except IndexError:
|
||||
return
|
||||
|
||||
# .done() necessarily means that a waiter will wake up later on and
|
||||
# either take the lock, or, if it was cancelled and lock wasn't
|
||||
# taken already, will hit this again and wake up a new waiter.
|
||||
if not fut.done():
|
||||
fut.set_result(True)
|
||||
|
||||
@@ -28,7 +28,8 @@
|
||||
"protected": "Protected",
|
||||
"allow_hosts": "Allowed hosts",
|
||||
"restore_on_restart": "Restore outs on restart",
|
||||
"poll_outs": "Poll outs"
|
||||
"poll_outs": "Poll outs",
|
||||
"update_time": "Sync time"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -47,7 +48,8 @@
|
||||
"protected": "Protected",
|
||||
"allow_hosts": "Allowed hosts",
|
||||
"restore_on_restart": "Restore outs on restart",
|
||||
"poll_outs": "Poll outs"
|
||||
"poll_outs": "Poll outs",
|
||||
"update_time": "Sync time"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
"protected": "Блокировать неразрешенные соединения",
|
||||
"restore_on_restart": "Восстанавливать выходы при перезагрузке",
|
||||
"allow_hosts": "Разрешенные ip (через ;)",
|
||||
"poll_outs": "Обновлять выходы (регулярно)"
|
||||
"poll_outs": "Обновлять выходы (регулярно)",
|
||||
"update_time": "Синхронизировать время"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,7 +49,8 @@
|
||||
"protected": "Блокировать неразрешенные соединения",
|
||||
"allow_hosts": "Разрешенные ip (через ;)",
|
||||
"restore_on_restart": "Восстанавливать выходы при перезагрузке",
|
||||
"poll_outs": "Обновлять выходы (регулярно)"
|
||||
"poll_outs": "Обновлять выходы (регулярно)",
|
||||
"update_time": "Синхронизировать время"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
"protected": "Блокувати недозволені з'єднання",
|
||||
"allow_hosts": "Дозволені ip (через ;)",
|
||||
"restore_on_restart": "Відновлювати виходи при перезавантаженні",
|
||||
"poll_outs": "Оновити виходи"
|
||||
"poll_outs": "Оновити виходи",
|
||||
"update_time": "Осинхронізувати час"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,8 @@
|
||||
выполнении предыдущей.
|
||||
- поддержка [ds2413](https://www.ab-log.ru/smart-house/ethernet/megad-2w) (начиная с версии 0.4.1)
|
||||
- поддержка MCP23008/MCP23017/PCA9685 (начиная с версии 0.5.1)
|
||||
- поддержка всех возможных датчиков в режиме I2C-ANY, полный список поддерживаемых датчиков
|
||||
[по ссылке](https://github.com/andvikt/mega_hacs/wiki/i2c) (начиная с версии 0.6.1)
|
||||
|
||||
## Установка
|
||||
Рекомендованный способ с поддержкой обновлений - [HACS](https://hacs.xyz/docs/installation/installation):
|
||||
|
||||
Reference in New Issue
Block a user