project-chip#102, project-chip#103

ivmarkov · Jan 8, 2024 · 5610857 · 5610857
1 parent 370035e
commit 5610857
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/examples/onoff_light/src/main.rs b/examples/onoff_light/src/main.rs
@@ -39,7 +39,7 @@ mod dev_att;
 #[cfg(feature = "std")]
 fn main() -> Result<(), Error> {
     let thread = std::thread::Builder::new()
-        .stack_size(160 * 1024)
+        .stack_size(180 * 1024)
         .spawn(run)
         .unwrap();
 
@@ -74,6 +74,7 @@ fn run() -> Result<(), Error> {
         device_name: "OnOff Light",
         product_name: "Light123",
         vendor_name: "Vendor PQR",
+        unique_id: "aabbccdd",
     };
 
     let (ipv4_addr, ipv6_addr, interface) = initialize_network()?;

diff --git a/rs-matter/src/data_model/cluster_basic_information.rs b/rs-matter/src/data_model/cluster_basic_information.rs
@@ -41,6 +41,7 @@ pub enum Attributes {
     SwVer(AttrType<u32>) = 9,
     SwVerString(AttrUtfType) = 0xa,
     SerialNo(AttrUtfType) = 0x0f,
+    UniqueId(AttrUtfType) = 0x12,
 }
 
 attribute_enum!(Attributes);
@@ -56,6 +57,7 @@ pub enum AttributesDiscriminants {
     SwVer = 9,
     SwVerString = 0xa,
     SerialNo = 0x0f,
+    UniqueId = 0x12,
 }
 
 #[derive(Default)]
@@ -70,6 +72,7 @@ pub struct BasicInfoConfig<'a> {
     pub device_name: &'a str,
     pub vendor_name: &'a str,
     pub product_name: &'a str,
+    pub unique_id: &'a str,
 }
 
 pub const CLUSTER: Cluster<'static> = Cluster {
@@ -128,6 +131,11 @@ pub const CLUSTER: Cluster<'static> = Cluster {
             Access::RV,
             Quality::FIXED,
         ),
+        Attribute::new(
+            AttributesDiscriminants::UniqueId as u16,
+            Access::RV,
+            Quality::FIXED,
+        ),
     ],
     commands: &[],
 };
@@ -166,6 +174,7 @@ impl<'a> BasicInfoCluster<'a> {
                     Attributes::SwVer(codec) => codec.encode(writer, self.cfg.sw_ver),
                     Attributes::SwVerString(codec) => codec.encode(writer, self.cfg.sw_ver_str),
                     Attributes::SerialNo(codec) => codec.encode(writer, self.cfg.serial_no),
+                    Attributes::UniqueId(codec) => codec.encode(writer, self.cfg.unique_id),
                 }
             }
         } else {

diff --git a/rs-matter/src/data_model/objects/encoder.rs b/rs-matter/src/data_model/objects/encoder.rs
@@ -30,7 +30,7 @@ use crate::{
     interaction_model::messages::ib::{AttrDataTag, AttrRespTag},
     tlv::{FromTLV, TLVElement, TLVWriter, TagType, ToTLV},
 };
-use log::error;
+use log::{error, warn};
 
 use super::{AttrDetails, CmdDetails, DataModelHandler};
 
@@ -149,7 +149,10 @@ impl<'a, 'b, 'c> AttrDataEncoder<'a, 'b, 'c> {
         };
 
         if let Some(status) = status {
-            AttrResp::Status(status).to_tlv(tw, TagType::Anonymous)?;
+            let resp = AttrResp::Status(status);
+            warn!("Read status: {:?}", resp);
+
+            resp.to_tlv(tw, TagType::Anonymous)?;
         }
 
         Ok(true)
@@ -172,6 +175,7 @@ impl<'a, 'b, 'c> AttrDataEncoder<'a, 'b, 'c> {
         };
 
         if let Some(status) = status {
+            warn!("Write status: {:?}", status);
             status.to_tlv(tw, TagType::Anonymous)?;
         }
 

diff --git a/rs-matter/src/transport/core.rs b/rs-matter/src/transport/core.rs
@@ -694,7 +694,6 @@ impl<'a> Matter<'a> {
             };
 
             if send {
-                dest_tx.log("Sending packet");
                 self.notify_changed();
 
                 return Ok(true);

diff --git a/rs-matter/src/transport/session.rs b/rs-matter/src/transport/session.rs
@@ -263,6 +263,8 @@ impl Session {
     pub(crate) fn send(&mut self, epoch: Epoch, tx: &mut Packet) -> Result<(), Error> {
         self.last_use = epoch();
 
+        tx.log("About to send packet");
+
         tx.proto_encode(
             self.peer_addr,
             self.peer_nodeid,