Skip to content

Update to the new module names of rs-matter #9

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 2 commits into from
Jun 20, 2025
Merged

Update to the new module names of rs-matter #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a2408f
Update to the new module names of rs-matter
ivmarkov Jun 17, 2025
bb26efc
Switch to the main rs-matter branch
ivmarkov Jun 20, 2025
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
21 changes: 10 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,16 @@ use env_logger::Target;
use log::info;

use rs_matter_stack::eth::EthMatterStack;
use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::data_model::on_off;
use rs_matter_stack::matter::data_model::on_off::ClusterHandler as _;
use rs_matter_stack::matter::data_model::system_model::desc;
use rs_matter_stack::matter::data_model::system_model::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::desc;
use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::ClusterHandler as _;
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::test_device::TEST_DEV_DET;
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::matter::{clusters, devices};
Expand Down Expand Up @@ -108,7 +107,7 @@ fn main() -> Result<(), Error> {
));

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

// Chain our endpoint clusters with the
Expand Down
23 changes: 11 additions & 12 deletions examples/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@ use embassy_time::{Duration, Timer};

use log::info;

use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
use rs_matter_stack::matter::data_model::networks::wireless::NoopWirelessNetCtl;
use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
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::sdm::net_comm::NetworkType;
use rs_matter_stack::matter::data_model::system_model::desc::{ClusterHandler as _, DescHandler};
use rs_matter_stack::matter::dm::clusters::desc::{ClusterHandler as _, DescHandler};
use rs_matter_stack::matter::dm::clusters::net_comm::NetworkType;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::{ClusterHandler as _, OnOffHandler};
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::networks::wireless::NoopWirelessNetCtl;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::test_device::TEST_DEV_DET;
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;
Expand Down Expand Up @@ -55,7 +54,7 @@ fn main() -> Result<(), Error> {
));

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

// Chain our endpoint clusters with the
Expand Down
21 changes: 10 additions & 11 deletions examples/light_eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@ use env_logger::Target;
use log::info;

use rs_matter_stack::eth::EthMatterStack;
use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::data_model::on_off;
use rs_matter_stack::matter::data_model::on_off::ClusterHandler as _;
use rs_matter_stack::matter::data_model::system_model::desc;
use rs_matter_stack::matter::data_model::system_model::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::desc;
use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::ClusterHandler as _;
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::test_device::TEST_DEV_DET;
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::matter::{clusters, devices};
Expand Down Expand Up @@ -56,7 +55,7 @@ fn main() -> Result<(), Error> {
));

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

// Chain our endpoint clusters with the
Expand Down
14 changes: 7 additions & 7 deletions src/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use edge_nal::UdpBind;

use embassy_futures::select::{select, select3};

use rs_matter::data_model::networks::NetChangeNotif;
use rs_matter::data_model::objects::{AsyncHandler, AsyncMetadata, Endpoint};
use rs_matter::data_model::root_endpoint::{self, with_eth, with_sys, EthHandler, SysHandler};
use rs_matter::data_model::sdm::gen_comm::CommPolicy;
use rs_matter::data_model::sdm::gen_diag::{GenDiag, NetifDiag};
use rs_matter::data_model::sdm::net_comm::NetworkType;
use rs_matter::dm::clusters::gen_comm::CommPolicy;
use rs_matter::dm::clusters::gen_diag::{GenDiag, NetifDiag};
use rs_matter::dm::clusters::net_comm::NetworkType;
use rs_matter::dm::endpoints::{self, with_eth, with_sys, EthHandler, SysHandler};
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::dm::{AsyncHandler, AsyncMetadata, Endpoint};
use rs_matter::error::Error;
use rs_matter::pairing::DiscoveryCapabilities;
use rs_matter::transport::network::NoNetwork;
Expand Down Expand Up @@ -140,7 +140,7 @@ where
/// Return a metadata for the root (Endpoint 0) of the Matter Node
/// configured for Ethernet network.
pub const fn root_endpoint() -> Endpoint<'static> {
root_endpoint::root_endpoint(NetworkType::Ethernet)
endpoints::root_endpoint(NetworkType::Ethernet)
}

/// Return a handler for the root (Endpoint 0) of the Matter Node
Expand Down
14 changes: 7 additions & 7 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ use embassy_futures::select::{select4, Either4};
use embassy_sync::blocking_mutex::raw::NoopRawMutex;

use persist::{KvBlobBuffer, KvBlobStore, MatterPersist, NetworkPersist};
use rs_matter::data_model::basic_info::BasicInfoConfig;
use rs_matter::data_model::core::IMBuffer;
use rs_matter::data_model::networks::NetChangeNotif;
use rs_matter::data_model::objects::{AsyncHandler, AsyncMetadata};
use rs_matter::data_model::sdm::dev_att::DevAttDataFetcher;
use rs_matter::data_model::sdm::gen_diag::NetifDiag;
use rs_matter::data_model::subscriptions::Subscriptions;
use rs_matter::dm::clusters::basic_info::BasicInfoConfig;
use rs_matter::dm::clusters::dev_att::DevAttDataFetcher;
use rs_matter::dm::clusters::gen_diag::NetifDiag;
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::dm::subscriptions::Subscriptions;
use rs_matter::dm::IMBuffer;
use rs_matter::dm::{AsyncHandler, AsyncMetadata};
use rs_matter::error::{Error, ErrorCode};
use rs_matter::mdns::{Mdns, MdnsService};
use rs_matter::respond::DefaultResponder;
Expand Down
2 changes: 1 addition & 1 deletion src/mdns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use embassy_sync::blocking_mutex::raw::RawMutex;
use embassy_sync::signal::Signal;

use rs_matter::data_model::basic_info::BasicInfoConfig;
use rs_matter::dm::clusters::basic_info::BasicInfoConfig;
use rs_matter::error::{Error, ErrorCode};
use rs_matter::mdns::{Mdns, Service, ServiceMode};
use rs_matter::utils::cell::RefCell;
Expand Down
2 changes: 1 addition & 1 deletion src/persist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use core::fmt::Display;
use embassy_futures::select::select;
use embassy_sync::blocking_mutex::raw::{NoopRawMutex, RawMutex};

use rs_matter::data_model::networks::wireless::{WirelessNetwork, WirelessNetworks};
use rs_matter::dm::networks::wireless::{WirelessNetwork, WirelessNetworks};
use rs_matter::error::Error;
use rs_matter::utils::storage::pooled::{BufferAccess, PooledBuffer, PooledBuffers};
use rs_matter::utils::sync::{IfMutex, IfMutexGuard};
Expand Down
10 changes: 5 additions & 5 deletions src/wireless.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ use edge_nal::UdpBind;
use embassy_futures::select::{select, select3};
use embassy_sync::blocking_mutex::raw::RawMutex;

use rs_matter::data_model::networks::wireless::{
use rs_matter::dm::clusters::gen_diag::NetifDiag;
use rs_matter::dm::clusters::net_comm::NetCtl;
use rs_matter::dm::clusters::wifi_diag::WirelessDiag;
use rs_matter::dm::networks::wireless::{
NetCtlState, WirelessMgr, WirelessNetwork, WirelessNetworks, MAX_CREDS_SIZE,
};
use rs_matter::data_model::networks::NetChangeNotif;
use rs_matter::data_model::sdm::gen_diag::NetifDiag;
use rs_matter::data_model::sdm::net_comm::NetCtl;
use rs_matter::data_model::sdm::wifi_diag::WirelessDiag;
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::error::Error;
use rs_matter::pairing::DiscoveryCapabilities;
use rs_matter::transport::network::btp::{Btp, BtpContext, GattPeripheral};
Expand Down
22 changes: 10 additions & 12 deletions src/wireless/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@ use edge_nal::UdpBind;
use embassy_futures::select::{select, select3, select4};
use embassy_sync::blocking_mutex::raw::RawMutex;

use rs_matter::data_model::networks::wireless::{
use rs_matter::dm::clusters::gen_comm::CommPolicy;
use rs_matter::dm::clusters::gen_diag::GenDiag;
use rs_matter::dm::clusters::net_comm::{NetCtl, NetCtlStatus, NetworkType};
use rs_matter::dm::clusters::thread_diag::ThreadDiag;
use rs_matter::dm::endpoints::{self, with_sys, with_thread, SysHandler, ThreadHandler};
use rs_matter::dm::networks::wireless::{
self, NetCtlWithStatusImpl, NoopWirelessNetCtl, WirelessMgr,
};
use rs_matter::data_model::networks::NetChangeNotif;
use rs_matter::data_model::objects::{AsyncMetadata, Endpoint};
use rs_matter::data_model::root_endpoint::{
self, with_sys, with_thread, SysHandler, ThreadHandler,
};
use rs_matter::data_model::sdm::gen_comm::CommPolicy;
use rs_matter::data_model::sdm::gen_diag::GenDiag;
use rs_matter::data_model::sdm::net_comm::{NetCtl, NetCtlStatus, NetworkType};
use rs_matter::data_model::sdm::thread_diag::ThreadDiag;
use rs_matter::data_model::{objects::AsyncHandler, sdm::gen_diag::NetifDiag};
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::dm::{clusters::gen_diag::NetifDiag, AsyncHandler};
use rs_matter::dm::{AsyncMetadata, Endpoint};
use rs_matter::error::Error;
use rs_matter::pairing::DiscoveryCapabilities;
use rs_matter::transport::network::btp::GattPeripheral;
Expand Down Expand Up @@ -203,7 +201,7 @@ where
/// Return a metadata for the root (Endpoint 0) of the Matter Node
/// configured for BLE+Thread network.
pub const fn root_endpoint() -> Endpoint<'static> {
root_endpoint::root_endpoint(NetworkType::Thread)
endpoints::root_endpoint(NetworkType::Thread)
}

/// Return a handler for the root (Endpoint 0) of the Matter Node
Expand Down
20 changes: 10 additions & 10 deletions src/wireless/wifi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ use edge_nal::UdpBind;
use embassy_futures::select::{select, select3, select4};
use embassy_sync::blocking_mutex::raw::RawMutex;

use rs_matter::data_model::networks::wireless::{
use rs_matter::dm::clusters::gen_comm::CommPolicy;
use rs_matter::dm::clusters::gen_diag::GenDiag;
use rs_matter::dm::clusters::net_comm::{NetCtl, NetCtlStatus, NetworkType};
use rs_matter::dm::clusters::wifi_diag::WifiDiag;
use rs_matter::dm::endpoints::{self, with_sys, with_wifi, SysHandler, WifiHandler};
use rs_matter::dm::networks::wireless::{
self, NetCtlWithStatusImpl, NoopWirelessNetCtl, WirelessMgr,
};
use rs_matter::data_model::networks::NetChangeNotif;
use rs_matter::data_model::objects::{AsyncMetadata, Endpoint};
use rs_matter::data_model::root_endpoint::{self, with_sys, with_wifi, SysHandler, WifiHandler};
use rs_matter::data_model::sdm::gen_comm::CommPolicy;
use rs_matter::data_model::sdm::gen_diag::GenDiag;
use rs_matter::data_model::sdm::net_comm::{NetCtl, NetCtlStatus, NetworkType};
use rs_matter::data_model::sdm::wifi_diag::WifiDiag;
use rs_matter::data_model::{objects::AsyncHandler, sdm::gen_diag::NetifDiag};
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::dm::{clusters::gen_diag::NetifDiag, AsyncHandler};
use rs_matter::dm::{AsyncMetadata, Endpoint};
use rs_matter::error::Error;
use rs_matter::pairing::DiscoveryCapabilities;
use rs_matter::transport::network::btp::GattPeripheral;
Expand Down Expand Up @@ -199,7 +199,7 @@ where
/// Return a metadata for the root (Endpoint 0) of the Matter Node
/// configured for BLE+Wifi network.
pub const fn root_endpoint() -> Endpoint<'static> {
root_endpoint::root_endpoint(NetworkType::Wifi)
endpoints::root_endpoint(NetworkType::Wifi)
}

/// Return a handler for the root (Endpoint 0) of the Matter Node
Expand Down