Compare commits

...

5 Commits

Author SHA1 Message Date
Andrey
6732e1b7a2 add more logs on i2c update process 2021-03-03 13:55:35 +03:00
Andrey
f784c1c261 edit readme 2021-03-03 13:15:05 +03:00
Andrey
ab572c4db5 edit readme 2021-03-03 12:34:08 +03:00
Andrey
e55184f565 edit readme 2021-03-03 12:20:44 +03:00
Andrey
3f74f9739c edit readme 2021-03-03 12:20:09 +03:00
5 changed files with 39 additions and 35 deletions

View File

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

View File

@@ -530,9 +530,11 @@ class MegaD:
:return:
"""
_params = tuple(params.items())
return {
ret = {
_params: await self.request(**params)
}
self.lg.debug('i2c response: %s', ret)
return ret
async def get_config(self, nports=37):
ret = defaultdict(lambda: defaultdict(list))
@@ -588,7 +590,7 @@ class MegaD:
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].append(parsed)
ret['i2c'][port].extend(parsed)
i2c_sensors.extend(req)
elif cfg.pty in ('3', '2', '4'):
http_cmd = 'get'

View File

@@ -17,36 +17,37 @@ def parse_scan_page(page: str):
if params is None:
continue
params = dict(parse_qsl(urlparse(params).query))
if 'i2c_dev' in params:
dev = params['i2c_dev']
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, 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,
})
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, 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

View File

@@ -110,7 +110,8 @@ class MegaI2C(MegaPushEntity):
return self._device_class
def state(self):
return self.mega.values[self._params]
self.lg.debug(f'get % all states: %', self._params, self.mega.values)
return self.mega.values.get(self._params)
@property
def device_class(self):

View File

@@ -30,8 +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/ш2с)
- поддержка всех возможных датчиков в режиме I2C-ANY, полный список поддерживаемых датчиков
[по ссылке](https://github.com/andvikt/mega_hacs/wiki/i2c) (начиная с версии 0.6.1)
## Установка
Рекомендованный способ с поддержкой обновлений - [HACS](https://hacs.xyz/docs/installation/installation):