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

edit readme

Browse Source
This commit is contained in:
Andrey
2021-02-17 16:50:00 +03:00
parent 9544f562ba
commit ec505ac2ef
8 changed files with 182 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
custom_components/mega/__init__.py
View File

@@ -24,6 +24,29 @@ from .http import MegaView
_LOGGER = logging.getLogger(__name__)
CUSTOMIZE_PORT = vol.Schema({
vol.Optional(CONF_SKIP, description='исключить порт из сканирования', default=False): bool,
vol.Optional(CONF_INVERT, default=False): bool,
vol.Optional(CONF_NAME): vol.Any(str, {
vol.Required(str): str
}),
vol.Optional(CONF_DOMAIN): vol.Any('light', 'switch'),
vol.Optional(CONF_UNIT_OF_MEASUREMENT, description='единицы измерений, либо строка либо мепинг'):
vol.Any(str, {
vol.Required(str): str
}),
vol.Optional(
CONF_RESPONSE_TEMPLATE,
description='шаблон ответа когда на этот порт приходит'
'сообщение из меги '): cv.template,
vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
vol.Optional(CONF_GET_VALUE, default=True): bool,
vol.Optional(CONF_CONV_TEMPLATE): cv.template
})
CUSTOMIZE_DS2413 = vol.Schema({
vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
})
CONFIG_SCHEMA = vol.Schema(
{
DOMAIN: {
@@ -31,25 +54,10 @@ CONFIG_SCHEMA = vol.Schema(
# vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
vol.Required(str, description='id меги из веб-интерфейса'): {
vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
vol.Optional(int, description='номер порта'): {
vol.Optional(CONF_SKIP, description='исключить порт из сканирования', default=False): bool,
vol.Optional(CONF_INVERT, default=False): bool,
vol.Optional(CONF_NAME): vol.Any(str, {
vol.Required(str): str
}),
vol.Optional(CONF_DOMAIN): vol.Any('light', 'switch'),
vol.Optional(CONF_UNIT_OF_MEASUREMENT, description='единицы измерений, либо строка либо мепинг'):
vol.Any(str, {
vol.Required(str): str
}),
vol.Optional(
CONF_RESPONSE_TEMPLATE,
description='шаблон ответа когда на этот порт приходит'
'сообщение из меги '): cv.template,
vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
vol.Optional(CONF_GET_VALUE, default=True): bool,
vol.Optional(CONF_CONV_TEMPLATE): cv.template
}
vol.Optional(int, description='номер порта'): vol.Any(
CUSTOMIZE_PORT,
CUSTOMIZE_DS2413,
)
}
}
},

2
custom_components/mega/config_flow.py
View File

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

70
custom_components/mega/entities.py
View File

@@ -43,6 +43,9 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
id_suffix=None,
name=None,
unique_id=None,
http_cmd='get',
addr: str=None,
index=None,
):
super().__init__(mega.updater)
self._state: State = None
@@ -57,6 +60,9 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
self._name = name or f"{mega.id}_{port}" + \
(f"_{id_suffix}" if id_suffix else "")
self._customize: dict = None
self.http_cmd = http_cmd
self.index = index
self.addr = addr
@property
def customize(self):
@@ -66,7 +72,11 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
c = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM) or {}
c = c.get(self._mega_id) or {}
c = c.get(self.port) or {}
if self.addr is not None and self.index is not None and isinstance(c, dict):
idx = self.addr.lower() + f'_a' if self.index == 0 else '_b'
c = c.get(idx, {})
self._customize = c
return self._customize
@property
@@ -208,12 +218,17 @@ class MegaOutPort(MegaPushEntity):
self._is_on = None
self.dimmer = dimmer
def assumed_state(self) -> bool:
return True if self.index is not None or self.mega.mqtt is None else False
@property
def invert(self):
return self.customize.get(CONF_INVERT, False)
@property
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:
return self._state.attributes.get("brightness")
@@ -232,11 +247,33 @@ class MegaOutPort(MegaPushEntity):
return self._state == 'ON'
elif val is not None:
val = val.get("value")
if self.index and self.addr:
_val = val.get(self.addr)
if not isinstance(val, str):
self.mega.lg.warning(f'{self} has wrong state: {val}')
return
_val = _val.split('/')
if len(_val) >= 2:
val = val[self.index]
else:
self.mega.lg.warning(f'{self} has wrong state: {val}')
return
elif self.index and self.addr is None:
self.mega.lg.warning(f'{self} does not has addr')
return
if not self.invert:
return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
else:
return val == 'OFF' or str(val) == '0' or (safe_int(val) is not None and safe_int(val) == 0)
@property
def cmd_port(self):
if self.index is not None:
return f'{self.port}A' if self.index == 0 else f'{self.port}B'
else:
return self.port
async def async_turn_on(self, brightness=None, **kwargs) -> None:
brightness = brightness or self.brightness or 255
@@ -246,16 +283,39 @@ class MegaOutPort(MegaPushEntity):
cmd = brightness
else:
cmd = 1 if not self.invert else 0
await self.mega.request(cmd=f"{self.port}:{cmd}")
self.mega.values[self.port] = {'value': cmd}
cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
if self.addr:
cmd['addr'] = self.addr
await self.mega.request(**cmd)
if self.index is not None:
# обновление текущего стейта для ds2413
self.hass.async_create_task(self.mega.get_port(
port=self.port,
force_http=True,
conv=False,
http_cmd='list',
))
else:
self.mega.values[self.port] = {'value': cmd}
await self.get_state()
async def async_turn_off(self, **kwargs) -> None:
cmd = "0" if not self.invert else "1"
await self.mega.request(cmd=f"{self.port}:{cmd}")
self.mega.values[self.port] = {'value': cmd}
cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
if self.addr:
cmd['addr'] = self.addr
await self.mega.request(**cmd)
if self.index is not None:
# обновление текущего стейта для ds2413
self.hass.async_create_task(self.mega.get_port(
port=self.port,
force_http=True,
conv=False,
http_cmd='list',
))
else:
self.mega.values[self.port] = {'value': cmd}
await self.get_state()

25
custom_components/mega/hub.py
View File

@@ -196,6 +196,15 @@ class MegaD:
Polling ports
"""
self.lg.debug('poll')
for x in self.entities:
# обновление ds2413 устройств
if x.http_cmd == 'ds2413':
await self.get_port(
port=x.port,
force_http=True,
http_cmd='list',
conv=False
)
if self.mqtt is None:
await self.get_all_ports()
await self.get_sensors(only_list=True)
@@ -256,14 +265,14 @@ class MegaD:
ret = {'value': ret}
return ret
async def get_port(self, port, force_http=False, http_cmd='get'):
async def get_port(self, port, force_http=False, http_cmd='get', conv=True):
"""
Запрос состояния порта. Состояние всегда возвращается в виде объекта, всегда сохраняется в центральное
хранилище values
"""
self.lg.debug(f'get port %s', port)
if self.mqtt is None or force_http:
if http_cmd == 'list':
if http_cmd == 'list' and conv:
await self.request(pt=port, cmd='conv')
await asyncio.sleep(1)
ret = self.parse_response(await self.request(pt=port, cmd=http_cmd))
@@ -438,6 +447,18 @@ class MegaD:
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":
# ds2413
_data = await self.get_port(port=port, force_http=True, http_cmd='list', conv=False)
data = _data.get('value', {})
if not isinstance(data, dict):
self.lg.warning(f'can not add ds2413 on port {port}, it has wrong data: {_data}')
continue
for addr, state in data.items():
ret['light'][port].append([
{"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'

2
custom_components/mega/manifest.json
View File

@@ -15,5 +15,5 @@
"@andvikt"
],
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
"version": "v0.3.19"
"version": "v0.4.1b"
}

2
custom_components/mega/sensor.py
View File

@@ -102,7 +102,6 @@ class Mega1WSensor(MegaPushEntity):
unit_of_measurement,
device_class,
key=None,
http_cmd='get',
*args,
**kwargs
):
@@ -118,7 +117,6 @@ class Mega1WSensor(MegaPushEntity):
self._device_class = device_class
self._unit_of_measurement = unit_of_measurement
self.mega.sensors.append(self)
self.http_cmd = http_cmd
@property
def unit_of_measurement(self):