Skip to content
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.

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

Update embassy-time 0.3 -> 0.4 #219

Merged
merged 3 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ $ cargo build
### Building and running the example (Linux, MacOS X)

```
$ cargo run --example onoff_light --features async-io
$ cargo run --example onoff_light --features examples
```

### Building and running the BLE example (Linux, MacOS X)

```
$ cargo run --example onoff_light_bt --features examples
```

## Test
Expand Down
15 changes: 9 additions & 6 deletions rs-matter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ readme = "README.md"
keywords = ["matter", "smart", "smart-home", "IoT", "ESP32"]
categories = ["embedded", "network-programming"]
license = "Apache-2.0"
rust-version = "1.78"
rust-version = "1.83"

[features]
default = ["os", "rustcrypto"]
#default = ["os", "mbedtls"] mbedtls is broken since several months - check the root cause
os = ["std", "backtrace", "critical-section/std", "embassy-sync/std", "embassy-time/std", "embassy-time/generic-queue"]
examples = ["std", "async-io", "async-compat", "embassy-time-queue-utils/generic-queue-64"]
os = ["std", "backtrace", "critical-section/std", "embassy-sync/std", "embassy-time/std"]
std = ["alloc", "rand"]
backtrace = []
alloc = []
Expand All @@ -39,7 +40,8 @@ owo-colors = "4"
time = { version = "0.3", default-features = false }
verhoeff = { version = "1", default-features = false }
embassy-futures = "0.1"
embassy-time = "0.3"
embassy-time = "0.4"
embassy-time-queue-utils = "0.1"
embassy-sync = "0.6"
critical-section = "1.1"
domain = { version = "0.10", default-features = false, features = ["heapless"] }
Expand Down Expand Up @@ -87,18 +89,19 @@ futures-lite = "2"
async-channel = "2"
static_cell = "2"
similar = "2.6"
embassy-time-queue-utils = { version = "0.1", features = ["generic-queue-64"] }

[[example]]
name = "onoff_light"
path = "../examples/onoff_light/src/main.rs"
required-features = ["std", "async-io"]
required-features = ["examples"]

[[example]]
name = "onoff_light_bt"
path = "../examples/onoff_light_bt/src/main.rs"
required-features = ["std", "async-io", "async-compat"]
required-features = ["examples"]

# [[example]]
# name = "speaker"
# path = "../examples/speaker/src/main.rs"
# required-features = ["std", "async-io"]
# required-features = ["examples"]
1 change: 1 addition & 0 deletions rs-matter/tests/common/e2e/im/echo_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ impl TestChecker {
}

/// Get a handle to the globally unique mDNS instance
#[allow(static_mut_refs)]
pub fn get() -> Result<Arc<Mutex<Self>>, Error> {
unsafe {
INIT.call_once(|| {
Expand Down
Loading