Compare commits

..

4 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
Andrey
79dc46226a hotfix 2021-01-14 22:19:56 +03:00
4 changed files with 21 additions and 17 deletions

View File

@@ -1,5 +1,6 @@
"""Platform for light integration."""
import logging
import asyncio
import voluptuous as vol
@@ -69,7 +70,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
async_add_devices(devices)
await scan()
asyncio.create_task(scan())
class MegaBinarySensor(BinarySensorEntity, BaseMegaEntity):

View File

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

View File

@@ -1,6 +1,6 @@
"""Platform for light integration."""
import logging
import asyncio
import voluptuous as vol
from homeassistant.components.light import (
@@ -85,7 +85,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
devices.append(light)
async_add_devices(devices)
await scan_ports()
asyncio.create_task(scan_ports())
class MegaLight(LightEntity, BaseMegaEntity):

View File

@@ -1,4 +1,5 @@
"""Platform for light integration."""
import asyncio
import logging
import voluptuous as vol
@@ -94,7 +95,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
if values is None:
continue
if isinstance(values, str) and TEMP_PATT.search(values):
values = {TEMP: values}
values = {TEMP: values}
elif not isinstance(values, dict):
values = {None: values}
for key in values:
@@ -111,7 +112,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
async_add_devices(devices)
await scan()
asyncio.create_task(scan())
class Mega1WSensor(BaseMegaEntity):