jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 13:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unique id in cluster channels (#25707)

Browse Source
This commit is contained in:
David F. Mulcahey 2019-08-05 08:47:42 -04:00 committed by Alexei Chetroi
parent 5e00b546eb
commit ac5fcff1cd
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/zha/core/channels/__init__.py
View File

@ -23,7 +23,7 @@ from ..const import (
REPORT_CONFIG_RPT_CHANGE,
SIGNAL_ATTR_UPDATED,
)
from ..helpers import LogMixin, construct_unique_id, get_attr_id_by_name, safe_read
from ..helpers import LogMixin, get_attr_id_by_name, safe_read
from ..registries import CLUSTER_REPORT_CONFIGS
_LOGGER = logging.getLogger(__name__)
@ -89,7 +89,13 @@ class ZigbeeChannel(LogMixin):
self._generic_id = "channel_0x{:04x}".format(cluster.cluster_id)
self._cluster = cluster
self._zha_device = device
self._unique_id = construct_unique_id(cluster)
self._unique_id = "{}:{}:0x{:04x}".format(
str(device.ieee), cluster.endpoint.endpoint_id, cluster.cluster_id
)
# this keeps logs consistent with zigpy logging
self._log_id = "0x{:04x}:{}:0x{:04x}".format(
device.nwk, cluster.endpoint.endpoint_id, cluster.cluster_id
)
self._report_config = CLUSTER_REPORT_CONFIGS.get(
self._cluster.cluster_id, self.REPORT_CONFIG
)
@ -260,7 +266,7 @@ class ZigbeeChannel(LogMixin):
def log(self, level, msg, *args):
"""Log a message."""
msg = "[%s]: " + msg
args = (self.unique_id,) + args
args = (self._log_id,) + args
_LOGGER.log(level, msg, *args)
def __getattr__(self, name):
@ -313,7 +319,7 @@ class ZDOChannel(LogMixin):
self._cluster = cluster
self._zha_device = device
self._status = ChannelStatus.CREATED
self._unique_id = "{}_ZDO".format(device.name)
self._unique_id = "{}:{}_ZDO".format(str(device.ieee), device.name)
self._cluster.add_listener(self)
@property

7
homeassistant/components/zha/core/helpers.py
View File

@ -75,13 +75,6 @@ def convert_ieee(ieee_str):
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(