From 9364235f77669538c723e08a38d7b2cb1dd30775 Mon Sep 17 00:00:00 2001
From: Marcel <mibes@mibesco.com>
Date: Sat, 14 Jan 2023 16:00:37 +0100
Subject: [PATCH] Merged upstream

---
 matter/src/core.rs                                 | 2 +-
 matter/src/data_model/cluster_basic_information.rs | 4 ++--
 matter/tests/common/im_engine.rs                   | 9 +--------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/matter/src/core.rs b/matter/src/core.rs
index 0161fbe..68c07f4 100644
--- a/matter/src/core.rs
+++ b/matter/src/core.rs
@@ -61,7 +61,7 @@ impl Matter {
         let mdns = Mdns::get()?;
         mdns.set_values(dev_det.vid, dev_det.pid, &dev_det.device_name);
 
-        print_pairing_code_and_qr(dev_det, &dev_comm, DiscoveryCapabilities::default());
+        print_pairing_code_and_qr(&dev_det, &dev_comm, DiscoveryCapabilities::default());
 
         let fabric_mgr = Arc::new(FabricMgr::new()?);
         let acl_mgr = Arc::new(AclMgr::new()?);
diff --git a/matter/src/data_model/cluster_basic_information.rs b/matter/src/data_model/cluster_basic_information.rs
index 164d11c..eedd826 100644
--- a/matter/src/data_model/cluster_basic_information.rs
+++ b/matter/src/data_model/cluster_basic_information.rs
@@ -38,6 +38,8 @@ pub struct BasicInfoConfig {
     pub hw_ver: u16,
     pub sw_ver: u32,
     pub serial_no: String,
+    /// Device name; up to 32 characters
+    pub device_name: String,
 }
 
 fn attr_dm_rev_new() -> Result<Attribute, Error> {
@@ -47,8 +49,6 @@ fn attr_dm_rev_new() -> Result<Attribute, Error> {
         Access::RV,
         Quality::FIXED,
     )
-    /// Device name; up to 32 characters
-    pub device_name: String,
 }
 
 fn attr_vid_new(vid: u16) -> Result<Attribute, Error> {
diff --git a/matter/tests/common/im_engine.rs b/matter/tests/common/im_engine.rs
index 994bbaa..2ee55c8 100644
--- a/matter/tests/common/im_engine.rs
+++ b/matter/tests/common/im_engine.rs
@@ -107,14 +107,7 @@ impl ImEngine {
         // Only allow the standard peer node id of the IM Engine
         default_acl.add_subject(IM_ENGINE_PEER_ID).unwrap();
         acl_mgr.add(default_acl).unwrap();
-        let dm = DataModel::new(
-            dev_det,
-            dev_att,
-            fabric_mgr.clone(),
-            acl_mgr.clone(),
-            pase_mgr,
-        )
-        .unwrap();
+        let dm = DataModel::new(dev_det, dev_att, fabric_mgr, acl_mgr.clone(), pase_mgr).unwrap();
 
         {
             let mut d = dm.node.write().unwrap();