Skip to content

Commit

Permalink
Merge pull request project-chip#219 from ivmarkov/main
Browse files Browse the repository at this point in the history
Update embassy-time 0.3 -> 0.4
  • Loading branch information
kedars authored Jan 16, 2025
2 parents a2a46b0 + 7d721db commit 3230519
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
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

0 comments on commit 3230519

Please sign in to comment.