Matter: add UniqueID attribute to BridgedDeviceBasicInformation cluster

UniqueID became a mandatory attribute in Matter 1.4 for the
BridgedDeviceBasicInformation cluster. Its absence causes controllers such
as Home Assistant to fail to create entities for bridged endpoints — the
controller cannot stably identify a bridged device across re-pairings or
bridge restarts, so it refuses to add it.

Populate unique_id from SYSTEM_GetUnique() at construction time using the
format "silabs-%016llx", giving each bridged endpoint a stable
hardware-derived identity. Expose SetUniqueID()/GetUniqueID() so sketches
can override the value.

Co-Authored-By: Drew McCalmont <drewm@mcfamily.us>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 3 people

libraries/Matter/src/Matter.cpp

@@ -54,6 +54,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::NodeLabel::
 DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::VendorName::Id, CHAR_STRING, Device::DeviceDescStrSize, 0),   /* VendorName */
 DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::ProductName::Id, CHAR_STRING, Device::DeviceDescStrSize, 0),  /* ProductName */
 DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::SerialNumber::Id, CHAR_STRING, Device::DeviceDescStrSize, 0), /* SerialNumber */
+DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::UniqueID::Id, CHAR_STRING, Device::DeviceDescStrSize, 0),     /* UniqueID */
 DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::Reachable::Id, BOOLEAN, 1, 0),                                /* Reachable */
 DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::FeatureMap::Id, BITMAP32, 4, 0),                              /* FeatureMap */
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();                                                                                              /* ClusterRevision auto added by LIST_END */

libraries/Matter/src/Matter.h

@@ -44,7 +44,7 @@
 
 using ::chip::CommandId;
 
-extern EmberAfAttributeMetadata bridgedDeviceBasicAttrs[7];
+extern EmberAfAttributeMetadata bridgedDeviceBasicAttrs[8];
 extern EmberAfAttributeMetadata descriptorAttrs[6];
 extern EmberAfAttributeMetadata identifyAttrs[4];
 extern CommandId identifyIncomingCommands[2];

libraries/Matter/src/devices/MatterDevice.cpp

@@ -22,6 +22,7 @@
 #include "MatterDevice.h"
 
 #include <cstdio>
+#include "em_system.h"
 #include <platform/CHIPDeviceLayer.h>
 #include <app-common/zap-generated/callback.h>
 
@@ -45,6 +46,7 @@ Device::Device(const char* device_name) :
   chip::Platform::CopyString(this->vendor_name, "Silicon Labs");
   chip::Platform::CopyString(this->product_name, "Matter device");
   chip::Platform::CopyString(this->serial_number, "0000000042");
+  snprintf(this->unique_id, sizeof(this->unique_id), "silabs-%016llx", (unsigned long long)SYSTEM_GetUnique());
 }
 
 bool Device::IsReachable()
@@ -116,6 +118,16 @@ void Device::SetSerialNumber(const char* serialnumber)
   }
 }
 
+void Device::SetUniqueID(const char* uniqueid)
+{
+  bool changed = (strncmp(this->unique_id, uniqueid, sizeof(this->unique_id)) != 0);
+  if (changed) {
+    ChipLogProgress(DeviceLayer, "Device[%s]: New UniqueID=\"%s\"", this->device_name, uniqueid);
+    chip::Platform::CopyString(this->unique_id, uniqueid);
+    this->HandleDeviceStatusChanged(kChanged_UniqueID);
+  }
+}
+
 void Device::SetLocation(std::string location)
 {
   bool changed = (this->location.compare(location) != 0);
@@ -193,6 +205,9 @@ CHIP_ERROR Device::HandleReadBridgedDeviceBasicAttribute(ClusterId clusterId,
   } else if ((attributeId == SerialNumber::Id) && (maxReadLength == 32)) {
     MutableByteSpan zclNameSpan(buffer, maxReadLength);
     MakeZclCharString(zclNameSpan, this->GetSerialNumber());
+  } else if ((attributeId == UniqueID::Id) && (maxReadLength == 32)) {
+    MutableByteSpan zclNameSpan(buffer, maxReadLength);
+    MakeZclCharString(zclNameSpan, this->GetUniqueID());
   } else if ((attributeId == ClusterRevision::Id) && (maxReadLength == 2)) {
     uint16_t rev = this->GetBridgedDeviceBasicInformationClusterRevision();
     memcpy(buffer, &rev, sizeof(rev));
@@ -225,6 +240,9 @@ void Device::HandleDeviceStatusChanged(Changed_t itemChangedMask)
   if (itemChangedMask & kChanged_SerialNumber) {
     ScheduleMatterReportingCallback(this->endpoint_id, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::SerialNumber::Id);
   }
+  if (itemChangedMask & kChanged_UniqueID) {
+    ScheduleMatterReportingCallback(this->endpoint_id, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::UniqueID::Id);
+  }
 }
 
 CHIP_ERROR Device::HandleReadIdentifyAttribute(ClusterId clusterId,

libraries/Matter/src/devices/MatterDevice.h

@@ -48,7 +48,8 @@ class Device
     kChanged_VendorName   = 1u << 3,
     kChanged_ProductName  = 1u << 4,
     kChanged_SerialNumber = 1u << 5,
-    kChanged_Last         = kChanged_SerialNumber,
+    kChanged_UniqueID     = 1u << 6,
+    kChanged_Last         = kChanged_UniqueID,
   } Changed;
 
   enum device_type_t {
@@ -91,6 +92,7 @@ class Device
   void SetVendorName(const char* vendorname);
   void SetProductName(const char* productname);
   void SetSerialNumber(const char* serialnumber);
+  void SetUniqueID(const char* uniqueid);
   void SetLocation(std::string location);
   void SetDeviceChangeCallback(void (*matter_device_change_cb)(void));
   void CallDeviceChangeCallback();
@@ -179,6 +181,11 @@ class Device
     return this->serial_number;
   }
 
+  inline char* GetUniqueID()
+  {
+    return this->unique_id;
+  }
+
   inline std::string GetLocation()
   {
     return this->location;
@@ -206,6 +213,7 @@ class Device
   char vendor_name[DeviceDescStrSize];
   char product_name[DeviceDescStrSize];
   char serial_number[DeviceDescStrSize];
+  char unique_id[DeviceDescStrSize];
   std::string location;
   chip::EndpointId endpoint_id;
   chip::EndpointId parent_endpoint_id;