From d28e13058db4101048205bab36817d1a4d568e3b Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Fri, 20 Sep 2024 11:35:59 +0200 Subject: [PATCH] specify attribute paths using cluster lib --- matter_server/common/custom_clusters.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/matter_server/common/custom_clusters.py b/matter_server/common/custom_clusters.py index 2a2131b3..a49c51eb 100644 --- a/matter_server/common/custom_clusters.py +++ b/matter_server/common/custom_clusters.py @@ -12,9 +12,13 @@ ClusterObjectDescriptor, ClusterObjectFieldDescriptor, ) +from chip.clusters.Objects import BasicInformation, ElectricalPowerMeasurement from chip.tlv import float32, uint -from matter_server.common.helpers.util import parse_attribute_path +from matter_server.common.helpers.util import ( + create_attribute_path_from_attribute, + parse_attribute_path, +) if TYPE_CHECKING: from matter_server.common.models import MatterNodeData @@ -27,6 +31,8 @@ ALL_CUSTOM_CLUSTERS: dict[int, Cluster] = {} ALL_CUSTOM_ATTRIBUTES: dict[int, dict[int, ClusterAttributeDescriptor]] = {} +VENDOR_ID_EVE = 4874 + @dataclass class CustomClusterMixin: @@ -64,13 +70,19 @@ def __init_subclass__(cls: ClusterAttributeDescriptor, *args, **kwargs) -> None: def should_poll_eve_energy(node_data: MatterNodeData) -> bool: """Check if the (Eve Energy) custom attribute should be polled for state changes.""" - if node_data.attributes.get("0/40/2") != 4874: + attr_path = create_attribute_path_from_attribute( + 0, BasicInformation.Attributes.VendorID + ) + if node_data.attributes.get(attr_path) != VENDOR_ID_EVE: # Some implementation (such as MatterBridge) use the # Eve cluster to send the power measurements. Filter that out. return False # if the ElectricalPowerMeasurement cluster is NOT present, # we should poll the custom Eve cluster attribute(s). - return node_data.attributes.get("2/144/65531") is None + attr_path = create_attribute_path_from_attribute( + 2, ElectricalPowerMeasurement.Attributes.AttributeList + ) + return node_data.attributes.get(attr_path) is None @dataclass