Compare commits

..

3 Commits

Author SHA1 Message Date
Andrey
adb65529a2 hotfix 2021-01-14 23:05:30 +03:00
Andrey
768d46d952 hotfix 2021-01-14 22:48:07 +03:00
Andrey
359c6b99b7 hotfix 2021-01-14 22:27:07 +03:00
3 changed files with 15 additions and 13 deletions

View File

@@ -72,6 +72,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
asyncio.create_task(scan()) asyncio.create_task(scan())
class MegaBinarySensor(BinarySensorEntity, BaseMegaEntity): class MegaBinarySensor(BinarySensorEntity, BaseMegaEntity):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

View File

@@ -153,9 +153,11 @@ class MegaD:
try: try:
if '"value":NA' in msg.payload.decode(): if '"value":NA' in msg.payload.decode():
if not ftr.done():
ftr.set_result(None) ftr.set_result(None)
return return
ret = json.loads(msg.payload).get('value') ret = json.loads(msg.payload).get('value')
if not ftr.done():
ftr.set_result(ret) ftr.set_result(ret)
except Exception as exc: except Exception as exc:
ret = None ret = None
@@ -167,12 +169,12 @@ class MegaD:
) )
async with self.lck: async with self.lck:
try:
unsub = await self.mqtt.async_subscribe( unsub = await self.mqtt.async_subscribe(
topic=f'{self.mqtt_id}/{port}', topic=f'{self.mqtt_id}/{port}',
msg_callback=cb, msg_callback=cb,
qos=1, qos=1,
) )
try:
await self.mqtt.async_publish( await self.mqtt.async_publish(
topic=f'{self.mqtt_id}/cmd', topic=f'{self.mqtt_id}/cmd',
payload=f'get:{port}', payload=f'get:{port}',
@@ -268,7 +270,6 @@ class MegaD:
return pty, m return pty, m
async def scan_ports(self,): async def scan_ports(self,):
async with self.lck:
for x in range(38): for x in range(38):
ret = await self.scan_port(x) ret = await self.scan_port(x)
if ret: if ret: