From 5a25904a0786a808bd45cc43e2718cac1a698b33 Mon Sep 17 00:00:00 2001 From: thekuwayama Date: Sun, 23 Jul 2023 18:48:35 +0900 Subject: [PATCH 1/2] modify: Quality bits into separated flags --- rs-matter/src/data_model/objects/attribute.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rs-matter/src/data_model/objects/attribute.rs b/rs-matter/src/data_model/objects/attribute.rs index 69fd544..5eadb0e 100644 --- a/rs-matter/src/data_model/objects/attribute.rs +++ b/rs-matter/src/data_model/objects/attribute.rs @@ -72,10 +72,10 @@ bitflags! { #[derive(Default)] pub struct Quality: u8 { const NONE = 0x00; - const SCENE = 0x01; - const PERSISTENT = 0x02; - const FIXED = 0x03; - const NULLABLE = 0x04; + const SCENE = 0x01; // Short: S + const PERSISTENT = 0x02; // Short: N + const FIXED = 0x04; // Short: F + const NULLABLE = 0x08; // Short: X } } From b3224d2b40a98b5f5ebf4790e68f1abb2b5409f4 Mon Sep 17 00:00:00 2001 From: thekuwayama Date: Sun, 23 Jul 2023 22:41:53 +0900 Subject: [PATCH 2/2] add SN Quality --- rs-matter/src/data_model/cluster_on_off.rs | 2 +- rs-matter/src/data_model/objects/attribute.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rs-matter/src/data_model/cluster_on_off.rs b/rs-matter/src/data_model/cluster_on_off.rs index 8d03d9b..8e23e61 100644 --- a/rs-matter/src/data_model/cluster_on_off.rs +++ b/rs-matter/src/data_model/cluster_on_off.rs @@ -54,7 +54,7 @@ pub const CLUSTER: Cluster<'static> = Cluster { Attribute::new( AttributesDiscriminants::OnOff as u16, Access::RV, - Quality::PERSISTENT, + Quality::SN, ), ], commands: &[ diff --git a/rs-matter/src/data_model/objects/attribute.rs b/rs-matter/src/data_model/objects/attribute.rs index 5eadb0e..b9b7851 100644 --- a/rs-matter/src/data_model/objects/attribute.rs +++ b/rs-matter/src/data_model/objects/attribute.rs @@ -76,6 +76,8 @@ bitflags! { const PERSISTENT = 0x02; // Short: N const FIXED = 0x04; // Short: F const NULLABLE = 0x08; // Short: X + + const SN = Self::SCENE.bits | Self::PERSISTENT.bits; } }