evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged upstream

Browse source
This commit is contained in:
Marcel 2023-01-14 16:00:37 +01:00
parent 5499e6ccdc
commit 9364235f77
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matter/src/core.rs
View file

@ -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()?);

4
matter/src/data_model/cluster_basic_information.rs
View file

@ -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> {

9
matter/tests/common/im_engine.rs
View file

@ -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();