Merge pull request project-chip#160 from ivmarkov/commissioning-info

Expose concurrent commissioning flow attribute
ivmarkov · May 14, 2024 · e6007f1 · e6007f1
2 parents bcf4979 + c3a7584
commit e6007f1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/rs-matter/src/data_model/root_endpoint.rs b/rs-matter/src/data_model/root_endpoint.rs
@@ -139,7 +139,7 @@ pub fn wrap<'a>(
         .chain(
             endpoint_id,
             general_commissioning::ID,
-            GenCommCluster::new(failsafe, rand),
+            GenCommCluster::new(failsafe, true, rand),
         )
         .chain(
             endpoint_id,

diff --git a/rs-matter/src/data_model/sdm/general_commissioning.rs b/rs-matter/src/data_model/sdm/general_commissioning.rs
@@ -46,6 +46,7 @@ pub enum Attributes {
     BasicCommissioningInfo(()) = 1,
     RegConfig(AttrType<u8>) = 2,
     LocationCapability(AttrType<u8>) = 3,
+    SupportsConcurrentConnection(AttrType<bool>) = 4,
 }
 
 attribute_enum!(Attributes);
@@ -106,6 +107,11 @@ pub const CLUSTER: Cluster<'static> = Cluster {
             Access::RV,
             Quality::FIXED,
         ),
+        Attribute::new(
+            AttributesDiscriminants::SupportsConcurrentConnection as u16,
+            Access::RV,
+            Quality::FIXED,
+        ),
     ],
     commands: &[
         Commands::ArmFailsafe as _,
@@ -129,11 +135,16 @@ struct BasicCommissioningInfo {
 pub struct GenCommCluster<'a> {
     data_ver: Dataver,
     basic_comm_info: BasicCommissioningInfo,
+    supports_concurrent_connection: bool,
     failsafe: &'a RefCell<FailSafe>,
 }
 
 impl<'a> GenCommCluster<'a> {
-    pub fn new(failsafe: &'a RefCell<FailSafe>, rand: Rand) -> Self {
+    pub fn new(
+        failsafe: &'a RefCell<FailSafe>,
+        supports_concurrent_connection: bool,
+        rand: Rand,
+    ) -> Self {
         Self {
             data_ver: Dataver::new(rand),
             failsafe,
@@ -142,6 +153,7 @@ impl<'a> GenCommCluster<'a> {
                 expiry_len: 120,
                 max_cmltv_failsafe_secs: 120,
             },
+            supports_concurrent_connection,
         }
     }
 
@@ -169,6 +181,9 @@ impl<'a> GenCommCluster<'a> {
                             .to_tlv(&mut writer, AttrDataWriter::TAG)?;
                         writer.complete()
                     }
+                    Attributes::SupportsConcurrentConnection(codec) => {
+                        codec.encode(writer, self.supports_concurrent_connection)
+                    }
                 }
             }
         } else {

diff --git a/rs-matter/tests/data_model/long_reads.rs b/rs-matter/tests/data_model/long_reads.rs
@@ -149,6 +149,12 @@ fn wildcard_read_resp(part: u8) -> Vec<AttrResp<'static>> {
             gen_comm::AttributesDiscriminants::BasicCommissioningInfo,
             dont_care.clone()
         ),
+        attr_data!(
+            0,
+            48,
+            gen_comm::AttributesDiscriminants::SupportsConcurrentConnection,
+            dont_care.clone()
+        ),
         attr_data!(0, 49, GlobalElements::FeatureMap, dont_care.clone()),
         attr_data!(0, 49, GlobalElements::AttributeList, dont_care.clone()),
         attr_data!(
@@ -201,15 +207,15 @@ fn wildcard_read_resp(part: u8) -> Vec<AttrResp<'static>> {
             adm_comm::AttributesDiscriminants::WindowStatus,
             dont_care.clone()
         ),
+    ];
+
+    let part2 = vec![
         attr_data!(
             0,
             60,
             adm_comm::AttributesDiscriminants::AdminFabricIndex,
             dont_care.clone()
         ),
-    ];
-
-    let part2 = vec![
         attr_data!(
             0,
             60,