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

ZHA component rewrite part 3 - update helpers (#20463)

Browse source 
* update helpers

* address comments

* remove ieee

* cluster id as hex too
This commit is contained in:
David F. Mulcahey 2019-01-28 19:40:00 -05:00 • committed by Paulus Schoutsen
parent bb1583c453
commit 34090bd021
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ async def bind_cluster(entity_id, cluster):
) )
async def configure_reporting(entity_id, cluster, attr, skip_bind=False, async def configure_reporting(entity_id, cluster, attr,
min_report=REPORT_CONFIG_MIN_INT, min_report=REPORT_CONFIG_MIN_INT,
max_report=REPORT_CONFIG_MAX_INT, max_report=REPORT_CONFIG_MAX_INT,
reportable_change=REPORT_CONFIG_RPT_CHANGE, reportable_change=REPORT_CONFIG_RPT_CHANGE,
@ -68,12 +68,13 @@ async def configure_reporting(entity_id, cluster, attr, skip_bind=False,
from zigpy.exceptions import DeliveryError from zigpy.exceptions import DeliveryError
attr_name = cluster.attributes.get(attr, [attr])[0] attr_name = cluster.attributes.get(attr, [attr])[0]
attr_id = get_attr_id_by_name(cluster, attr_name)
cluster_name = cluster.ep_attribute cluster_name = cluster.ep_attribute
kwargs = {} kwargs = {}
if manufacturer: if manufacturer:
kwargs['manufacturer'] = manufacturer kwargs['manufacturer'] = manufacturer
try: try:
res = await cluster.configure_reporting(attr, min_report, res = await cluster.configure_reporting(attr_id, min_report,
max_report, reportable_change, max_report, reportable_change,
**kwargs) **kwargs)
_LOGGER.debug( _LOGGER.debug(
@ -101,11 +102,11 @@ async def bind_configure_reporting(entity_id, cluster, attr, skip_bind=False,
if not skip_bind: if not skip_bind:
await bind_cluster(entity_id, cluster) await bind_cluster(entity_id, cluster)
await configure_reporting(entity_id, cluster, attr, skip_bind=False, await configure_reporting(entity_id, cluster, attr,
min_report=REPORT_CONFIG_MIN_INT, min_report=min_report,
max_report=REPORT_CONFIG_MAX_INT, max_report=max_report,
reportable_change=REPORT_CONFIG_RPT_CHANGE, reportable_change=reportable_change,
manufacturer=None) manufacturer=manufacturer)
async def check_zigpy_connection(usb_path, radio_type, database_path): async def check_zigpy_connection(usb_path, radio_type, database_path):
@ -136,3 +137,18 @@ def convert_ieee(ieee_str):
"""Convert given ieee string to EUI64.""" """Convert given ieee string to EUI64."""
from zigpy.types import EUI64, uint8_t from zigpy.types import EUI64, uint8_t
return EUI64([uint8_t(p, base=16) for p in ieee_str.split(':')]) return EUI64([uint8_t(p, base=16) for p in ieee_str.split(':')])
def construct_unique_id(cluster):
"""Construct a unique id from a cluster."""
return "0x{:04x}:{}:0x{:04x}".format(
cluster.endpoint.device.nwk,
cluster.endpoint.endpoint_id,
cluster.cluster_id
)
def get_attr_id_by_name(cluster, attr_name):
"""Get the attribute id for a cluster attribute by its name."""
return next((attrid for attrid, (attrname, datatype) in
cluster.attributes.items() if attr_name == attrname), None)