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

fix scanning

Browse Source
This commit is contained in:
Andrey
2021-01-25 16:37:48 +03:00
parent 7d6273539e
commit 57f355d479
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
custom_components/mega/hub.py
View File

@@ -125,8 +125,12 @@ class MegaD:
async def get_sensors(self): async def get_sensors(self):
self.lg.debug(self.sensors) self.lg.debug(self.sensors)
ports = []
for x in self.sensors: for x in self.sensors:
await self.get_port(x, force_http=True) if x.port in ports:
continue
await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
ports.append(x.port)
@property @property
def is_online(self): def is_online(self):
@@ -157,6 +161,7 @@ class MegaD:
self.lg.debug('poll') self.lg.debug('poll')
if self.mqtt is None: if self.mqtt is None:
await self.get_all_ports() await self.get_all_ports()
await self.get_sensors()
return return
if len(self.sensors) > 0: if len(self.sensors) > 0:
await self.get_sensors() await self.get_sensors()
@@ -209,14 +214,14 @@ class MegaD:
ret = {'value': ret} ret = {'value': ret}
return ret return ret
async def get_port(self, port, force_http=False): async def get_port(self, port, force_http=False, http_cmd='get'):
""" """
Запрос состояния порта. Состояние всегда возвращается в виде объекта, всегда сохраняется в центральное Запрос состояния порта. Состояние всегда возвращается в виде объекта, всегда сохраняется в центральное
хранилище values хранилище values
""" """
self.lg.debug(f'get port %s', port) self.lg.debug(f'get port %s', port)
if self.mqtt is None or force_http: if self.mqtt is None or force_http:
ret = await self.request(pt=port, cmd='get') ret = await self.request(pt=port, cmd=http_cmd)
ret = self.parse_response(ret) ret = self.parse_response(ret)
self.values[port] = ret self.values[port] = ret
return ret return ret
@@ -361,7 +366,11 @@ class MegaD:
ret['light'][port].append({'dimmer': m == '1'}) ret['light'][port].append({'dimmer': m == '1'})
elif pty == '3': elif pty == '3':
try: try:
http_cmd = 'get'
values = await self.get_port(port, force_http=True) values = await self.get_port(port, force_http=True)
if values is None:
values = await self.get_port(port, force_http=True, http_cmd='list')
http_cmd = 'list'
except asyncio.TimeoutError: except asyncio.TimeoutError:
self.lg.warning(f'timout on port {port}') self.lg.warning(f'timout on port {port}')
continue continue
@@ -382,6 +391,7 @@ class MegaD:
unit_of_measurement=UNITS.get(key, UNITS[TEMP]), unit_of_measurement=UNITS.get(key, UNITS[TEMP]),
device_class=CLASSES.get(key, CLASSES[TEMP]), device_class=CLASSES.get(key, CLASSES[TEMP]),
id_suffix=key, id_suffix=key,
http_cmd=http_cmd,
)) ))
return ret return ret

4
custom_components/mega/sensor.py
View File

@@ -101,6 +101,7 @@ class Mega1WSensor(MegaPushEntity):
unit_of_measurement, unit_of_measurement,
device_class, device_class,
key=None, key=None,
http_cmd='get',
*args, *args,
**kwargs **kwargs
): ):
@@ -115,8 +116,7 @@ class Mega1WSensor(MegaPushEntity):
self.key = key self.key = key
self._device_class = device_class self._device_class = device_class
self._unit_of_measurement = unit_of_measurement self._unit_of_measurement = unit_of_measurement
if self.port not in self.mega.sensors: self.mega.sensors.append(self)
self.mega.sensors.append(self.port)
@property @property
def unit_of_measurement(self): def unit_of_measurement(self):