Skip to content

Switch to latest rs-matter clusters #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivmarkov merged 1 commit into from
Jun 4, 2025
Merged

Switch to latest rs-matter clusters #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ rust-version = "1.77"
#rs-matter = { git = "https://github.com/project-chip/rs-matter" }
rs-matter = { git = "https://github.com/ivmarkov/rs-matter", branch = "next" }
#rs-matter = { path = "../rs-matter/rs-matter" }
edge-nal = { git = "https://github.com/ivmarkov/edge-net" }
edge-nal-std = { git = "https://github.com/ivmarkov/edge-net" }
edge-mdns = { git = "https://github.com/ivmarkov/edge-net" }
#edge-nal = { git = "https://github.com/ivmarkov/edge-net" }
#edge-nal-std = { git = "https://github.com/ivmarkov/edge-net" }
#edge-mdns = { git = "https://github.com/ivmarkov/edge-net" }

[features]
default = []
default = ["examples"]
log = ["dep:log", "rs-matter/log", "embedded-svc/log", "edge-mdns?/log"]
defmt = ["dep:defmt", "rs-matter/defmt", "embedded-svc/defmt", "heapless/defmt-03", "edge-mdns?/defmt"]
zeroconf = ["os", "rs-matter/zeroconf"]
Expand All @@ -30,7 +30,7 @@ os = ["backtrace", "rs-matter/os", "rustcrypto", "embassy-time/std"]
backtrace = ["std", "rs-matter/backtrace"]
std = ["alloc", "rs-matter/std", "edge-nal-std"]
alloc = ["embedded-svc/alloc"]
examples = ["os", "nix", "embassy-time-queue-utils/generic-queue-64"]
examples = ["log", "os", "nix", "embassy-time-queue-utils/generic-queue-64"]

[dependencies]
log = { version = "0.4", default-features = false, optional = true }
Expand All @@ -40,14 +40,15 @@ enumset = { version = "1", default-features = false }
bitflags = { version = "2.5", default-features = false }
scopeguard = { version = "1", default-features = false }
embassy-futures = "0.1"
embassy-sync = "0.6"
embassy-sync = "0.7"
embassy-time = "0.4"
embedded-svc = { version = "0.28", default-features = false }
rs-matter = { version = "0.1", default-features = false }
edge-nal = "0.5"
edge-nal-std = { version = "0.5", optional = true }
edge-mdns = { version = "0.5", optional = true }
rand_core = "0.6"
edge-mdns = { version = "0.6", optional = true }
rand_core = "0.9"
rand_core06 = { package = "rand_core", version = "0.6" } # For now, until `openthread` gets upgraded to 0.9 as well

[target.'cfg(all(unix, not(target_os = "espidf")))'.dependencies]
bitflags = "2"
Expand Down
67 changes: 28 additions & 39 deletions examples/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,26 @@ use embassy_time::{Duration, Timer};

use log::info;

use rs_matter_stack::matter::data_model::cluster_basic_information::BasicInfoConfig;
use rs_matter_stack::matter::data_model::cluster_on_off;
use rs_matter::data_model::networks::unix::UnixNetifs;
use rs_matter::data_model::networks::wireless::NoopWirelessNetCtl;
use rs_matter::data_model::objects::EmptyHandler;
use rs_matter::data_model::sdm::net_comm::NetworkType;
use rs_matter::test_device::TEST_DEV_DET;
use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::data_model::objects::{Dataver, Endpoint, HandlerCompat, Node};
use rs_matter_stack::matter::data_model::system_model::descriptor;
use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::data_model::on_off;
use rs_matter_stack::matter::data_model::on_off::{ClusterHandler as _, OnOffHandler};
use rs_matter_stack::matter::data_model::system_model::desc::{ClusterHandler as _, DescHandler};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::test_device::{TEST_DEV_ATT, TEST_DEV_COMM};
use rs_matter_stack::matter::transport::network::btp::BuiltinGattPeripheral;
use rs_matter_stack::matter::utils::init::InitMaybeUninit;
use rs_matter_stack::matter::utils::select::Coalesce;
use rs_matter_stack::matter::utils::sync::blocking::raw::StdRawMutex;
use rs_matter_stack::netif::UnixNetif;
use rs_matter_stack::matter::{clusters, devices};
use rs_matter_stack::persist::DirKvBlobStore;
use rs_matter_stack::test_device::{TEST_BASIC_COMM_DATA, TEST_DEV_ATT, TEST_PID, TEST_VID};
use rs_matter_stack::wireless::PreexistingWireless;
use rs_matter_stack::wireless::WifiMatterStack;
use rs_matter_stack::wireless::{DisconnectedController, PreexistingWireless};

use static_cell::StaticCell;

Expand All @@ -44,66 +49,50 @@ fn main() -> Result<(), Error> {
let stack = MATTER_STACK
.uninit()
.init_with(WifiMatterStack::init_default(
&BasicInfoConfig {
vid: TEST_VID,
pid: TEST_PID,
hw_ver: 2,
hw_ver_str: "2",
sw_ver: 1,
sw_ver_str: "1",
serial_no: "aabbccdd",
device_name: "MyLight",
product_name: "ACME Light",
vendor_name: "ACME",
sai: None,
sii: None,
},
TEST_BASIC_COMM_DATA,
&TEST_DEV_DET,
TEST_DEV_COMM,
&TEST_DEV_ATT,
));

// Our "light" on-off cluster.
// Can be anything implementing `rs_matter::data_model::AsyncHandler`
let on_off = cluster_on_off::OnOffCluster::new(Dataver::new_rand(stack.matter().rand()));
let on_off = on_off::OnOffHandler::new(Dataver::new_rand(stack.matter().rand()));

// Chain our endpoint clusters with the
// (root) Endpoint 0 system clusters in the final handler
let handler = stack
.root_handler()
let handler = EmptyHandler
// Our on-off cluster, on Endpoint 1
.chain(
LIGHT_ENDPOINT_ID,
cluster_on_off::ID,
HandlerCompat(&on_off),
OnOffHandler::CLUSTER.id,
Async(on_off::HandlerAdaptor(&on_off)),
)
// Each Endpoint needs a Descriptor cluster too
// Just use the one that `rs-matter` provides out of the box
.chain(
LIGHT_ENDPOINT_ID,
descriptor::ID,
HandlerCompat(descriptor::DescriptorCluster::new(Dataver::new_rand(
stack.matter().rand(),
))),
DescHandler::CLUSTER.id,
Async(DescHandler::new(Dataver::new_rand(stack.matter().rand())).adapt()),
);

// Run the Matter stack with our handler
// Using `pin!` is completely optional, but saves some memory due to `rustc`
// not being very intelligent w.r.t. stack usage in async functions
let store = stack.create_shared_store(DirKvBlobStore::new_default());
let mut matter = pin!(stack.run(
// A dummy wireless modem which does nothing
PreexistingWireless::new(
UnixNetif::new_default(),
edge_nal_std::Stack::new(),
DisconnectedController::new(),
UnixNetifs,
// A dummy wireless controller that does nothing
NoopWirelessNetCtl::new(NetworkType::Wifi),
BuiltinGattPeripheral::new(None),
),
// Will persist in `<tmp-dir>/rs-matter`
&store,
// Our `AsyncHandler` + `AsyncMetadata` impl
(NODE, handler),
// No user future to run
core::future::pending(),
// No user task to run
(),
));

// Just for demoing purposes:
Expand Down Expand Up @@ -146,11 +135,11 @@ const LIGHT_ENDPOINT_ID: u16 = 1;
const NODE: Node = Node {
id: 0,
endpoints: &[
WifiMatterStack::<StdRawMutex, ()>::root_metadata(),
WifiMatterStack::<StdRawMutex, ()>::root_endpoint(),
Endpoint {
id: LIGHT_ENDPOINT_ID,
device_types: &[DEV_TYPE_ON_OFF_LIGHT],
clusters: &[descriptor::CLUSTER, cluster_on_off::CLUSTER],
device_types: devices!(DEV_TYPE_ON_OFF_LIGHT),
clusters: clusters!(DescHandler::CLUSTER, OnOffHandler::CLUSTER),
},
],
};
63 changes: 25 additions & 38 deletions examples/light_eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@ use embassy_time::{Duration, Timer};
use env_logger::Target;
use log::info;

use rs_matter::data_model::networks::unix::UnixNetifs;
use rs_matter::data_model::objects::EmptyHandler;
use rs_matter::data_model::on_off::ClusterHandler as _;
use rs_matter::data_model::system_model::desc::ClusterHandler as _;
use rs_matter::test_device::TEST_DEV_DET;
use rs_matter::{clusters, devices};
use rs_matter_stack::eth::EthMatterStack;
use rs_matter_stack::matter::data_model::cluster_basic_information::BasicInfoConfig;
use rs_matter_stack::matter::data_model::cluster_on_off;
use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::data_model::objects::{Dataver, Endpoint, HandlerCompat, Node};
use rs_matter_stack::matter::data_model::system_model::descriptor;
use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::data_model::on_off;
use rs_matter_stack::matter::data_model::system_model::desc;
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::test_device::{TEST_DEV_ATT, TEST_DEV_COMM};
use rs_matter_stack::matter::utils::init::InitMaybeUninit;
use rs_matter_stack::matter::utils::select::Coalesce;
use rs_matter_stack::netif::UnixNetif;
use rs_matter_stack::persist::DirKvBlobStore;
use rs_matter_stack::test_device::{TEST_BASIC_COMM_DATA, TEST_DEV_ATT, TEST_PID, TEST_VID};

use static_cell::StaticCell;

Expand All @@ -46,63 +50,46 @@ fn main() -> Result<(), Error> {
let stack = MATTER_STACK
.uninit()
.init_with(EthMatterStack::init_default(
&BasicInfoConfig {
vid: TEST_VID,
pid: TEST_PID,
hw_ver: 2,
hw_ver_str: "2",
sw_ver: 1,
sw_ver_str: "1",
serial_no: "aabbccdd",
device_name: "MyLight",
product_name: "ACME Light",
vendor_name: "ACME",
sai: None,
sii: None,
},
TEST_BASIC_COMM_DATA,
&TEST_DEV_DET,
TEST_DEV_COMM,
&TEST_DEV_ATT,
));

// Our "light" on-off cluster.
// Can be anything implementing `rs_matter::data_model::AsyncHandler`
let on_off = cluster_on_off::OnOffCluster::new(Dataver::new_rand(stack.matter().rand()));
let on_off = on_off::OnOffHandler::new(Dataver::new_rand(stack.matter().rand()));

// Chain our endpoint clusters with the
// (root) Endpoint 0 system clusters in the final handler
let handler = stack
.root_handler()
// Our on-off cluster, on Endpoint 1
let handler = EmptyHandler
.chain(
LIGHT_ENDPOINT_ID,
cluster_on_off::ID,
HandlerCompat(&on_off),
on_off::OnOffHandler::CLUSTER.id,
Async(on_off::HandlerAdaptor(&on_off)),
)
// Each Endpoint needs a Descriptor cluster too
// Just use the one that `rs-matter` provides out of the box
.chain(
LIGHT_ENDPOINT_ID,
descriptor::ID,
HandlerCompat(descriptor::DescriptorCluster::new(Dataver::new_rand(
stack.matter().rand(),
))),
desc::DescHandler::CLUSTER.id,
Async(desc::DescHandler::new(Dataver::new_rand(stack.matter().rand())).adapt()),
);

// Run the Matter stack with our handler
// Using `pin!` is completely optional, but saves some memory due to `rustc`
// not being very intelligent w.r.t. stack usage in async functions
let store = stack.create_shared_store(DirKvBlobStore::new_default());
let mut matter = pin!(stack.run_preex(
// Will try to find a default network interface
UnixNetif::default(),
// The Matter stack needs UDP sockets to communicate with other Matter devices
edge_nal_std::Stack::new(),
// Will try to find a default network interface
UnixNetifs,
// Will persist in `<tmp-dir>/rs-matter`
&store,
// Our `AsyncHandler` + `AsyncMetadata` impl
(NODE, handler),
// No user future to run
core::future::pending(),
// No user task future to run
(),
));

// Just for demoing purposes:
Expand Down Expand Up @@ -142,11 +129,11 @@ const LIGHT_ENDPOINT_ID: u16 = 1;
const NODE: Node = Node {
id: 0,
endpoints: &[
EthMatterStack::<()>::root_metadata(),
EthMatterStack::<()>::root_endpoint(),
Endpoint {
id: LIGHT_ENDPOINT_ID,
device_types: &[DEV_TYPE_ON_OFF_LIGHT],
clusters: &[descriptor::CLUSTER, cluster_on_off::CLUSTER],
device_types: devices!(DEV_TYPE_ON_OFF_LIGHT),
clusters: clusters!(desc::DescHandler::CLUSTER, on_off::OnOffHandler::CLUSTER),
},
],
};
Loading