evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ZHA helpers (#20898)

Browse source 
* update helpers

* review comments

* remove ternary

* use correct timeout
This commit is contained in:
David F. Mulcahey 2019-02-10 13:01:07 -05:00 • committed by Martin Hjelmare
parent 9f7443ba97
commit 16154ab445
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
homeassistant/components/zha/core/helpers.py
View file

@ -6,7 +6,7 @@ https://home-assistant.io/components/zha/
"""
import asyncio
import logging
from concurrent.futures import TimeoutError as Timeout
from .const import (
DEFAULT_BAUDRATE, REPORT_CONFIG_MAX_INT, REPORT_CONFIG_MIN_INT,
REPORT_CONFIG_RPT_CHANGE, RadioType)
@ -48,7 +48,7 @@ async def bind_cluster(entity_id, cluster):
_LOGGER.debug(
"%s: bound '%s' cluster: %s", entity_id, cluster_name, res[0]
)
except DeliveryError as ex:
except (DeliveryError, Timeout) as ex:
_LOGGER.debug(
"%s: Failed to bind '%s' cluster: %s",
entity_id, cluster_name, str(ex)
@ -68,7 +68,12 @@ async def configure_reporting(entity_id, cluster, attr,
from zigpy.exceptions import DeliveryError
attr_name = cluster.attributes.get(attr, [attr])[0]
attr_id = get_attr_id_by_name(cluster, attr_name)
if isinstance(attr, str):
attr_id = get_attr_id_by_name(cluster, attr_name)
else:
attr_id = attr
cluster_name = cluster.ep_attribute
kwargs = {}
if manufacturer:
@ -82,7 +87,7 @@ async def configure_reporting(entity_id, cluster, attr,
entity_id, attr_name, cluster_name, min_report, max_report,
reportable_change, res
)
except DeliveryError as ex:
except (DeliveryError, Timeout) as ex:
_LOGGER.debug(
"%s: failed to set reporting for '%s' attr on '%s' cluster: %s",
entity_id, attr_name, cluster_name, str(ex)

14
homeassistant/components/zha/core/listeners.py
View file

@ -15,7 +15,7 @@ from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_send
from .helpers import (
bind_configure_reporting, construct_unique_id,
safe_read, get_attr_id_by_name)
safe_read, get_attr_id_by_name, bind_cluster)
from .const import (
CLUSTER_REPORT_CONFIGS, REPORT_CONFIG_DEFAULT, SIGNAL_ATTR_UPDATED,
SIGNAL_MOVE_LEVEL, SIGNAL_SET_LEVEL, SIGNAL_STATE_ATTR, ATTR_LEVEL
@ -373,18 +373,8 @@ class IASZoneListener(ClusterListener):
from zigpy.exceptions import DeliveryError
_LOGGER.debug("%s: started IASZoneListener configuration",
self._unique_id)
try:
res = await self._cluster.bind()
_LOGGER.debug(
"%s: bound '%s' cluster: %s",
self.unique_id, self._cluster.ep_attribute, res[0]
)
except DeliveryError as ex:
_LOGGER.debug(
"%s: Failed to bind '%s' cluster: %s",
self.unique_id, self._cluster.ep_attribute, str(ex)
)
await bind_cluster(self.unique_id, self._cluster)
ieee = self._cluster.endpoint.device.application.ieee
try: