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

Fix Matter Model ID for bridged devices (#126059)

Browse Source 
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
Marcel van der Veldt 2024-09-23 10:15:07 +02:00 committed by GitHub
parent d12367a680
commit 5b1e4e0691
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
homeassistant/components/matter/adapter.py
View File

@ -4,6 +4,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING, cast from typing import TYPE_CHECKING, cast
from chip.clusters import Objects as clusters
from matter_server.client.models.device_types import BridgedDevice from matter_server.client.models.device_types import BridgedDevice
from matter_server.common.models import EventType, ServerInfoMessage from matter_server.common.models import EventType, ServerInfoMessage
@ -194,11 +195,25 @@ class MatterAdapter:
identifiers.add((DOMAIN, f"{ID_TYPE_SERIAL}_{basic_info_serial_number}")) identifiers.add((DOMAIN, f"{ID_TYPE_SERIAL}_{basic_info_serial_number}"))
serial_number = basic_info_serial_number serial_number = basic_info_serial_number
model = ( # Model name is the human readable name of the model/product name
get_clean_name(basic_info.productName) or device_type.__name__ model_name = (
# productLabel is optional but preferred (e.g. Hue Bloom)
get_clean_name(basic_info.productLabel)
# alternative is the productName (e.g. LCT001)
or get_clean_name(basic_info.productName)
# if no product name, use the device type name
or device_type.__name__
if device_type if device_type
else None else None
) )
# Model ID is the non-human readable product ID
# we prefer the matter product ID so we can look it up in Matter DCL
if isinstance(basic_info, clusters.BridgedDeviceBasicInformation):
# On bridged devices, the productID is not available
model_id = None
else:
model_id = str(product_id) if (product_id := basic_info.productID) else None
dr.async_get(self.hass).async_get_or_create( dr.async_get(self.hass).async_get_or_create(
name=name, name=name,
config_entry_id=self.config_entry.entry_id, config_entry_id=self.config_entry.entry_id,
@ -206,8 +221,8 @@ class MatterAdapter:
hw_version=basic_info.hardwareVersionString, hw_version=basic_info.hardwareVersionString,
sw_version=basic_info.softwareVersionString, sw_version=basic_info.softwareVersionString,
manufacturer=basic_info.vendorName or endpoint.node.device_info.vendorName, manufacturer=basic_info.vendorName or endpoint.node.device_info.vendorName,
model=model, model=model_name,
model_id=str(basic_info.productID) if basic_info.productID else None, model_id=model_id,
serial_number=serial_number, serial_number=serial_number,
via_device=(DOMAIN, bridge_device_id) if bridge_device_id else None, via_device=(DOMAIN, bridge_device_id) if bridge_device_id else None,
) )