Skip to content

Commit 1a0a418

Browse files
authored
Merge pull request #11 from mibes/feature/cargo-restructure
Cargo restructure
2 parents 24fa1be + 4d06707 commit 1a0a418

File tree

4 files changed

+37
-24
lines changed

4 files changed

+37
-24
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[workspace]
2+
members = ["matter", "matter_macro_derive", "boxslab", "tools/tlv_tool"]
3+
4+
exclude = ["examples/*"]

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
1-
21
# matter-rs: The Rust Implementation of Matter
32

43
![experimental](https://img.shields.io/badge/status-Experimental-red) [![license](https://img.shields.io/badge/license-Apache2-green.svg)](https://raw.githubusercontent.com/project-chip/matter-rs/main/LICENSE)
54

6-
7-
85
[![Test Linux (OpenSSL)](https://github.com/project-chip/matter-rs/actions/workflows/test-linux-openssl.yml/badge.svg)](https://github.com/project-chip/matter-rs/actions/workflows/test-linux-openssl.yml)
96
[![Test Linux (mbedTLS)](https://github.com/project-chip/matter-rs/actions/workflows/test-linux-mbedtls.yml/badge.svg)](https://github.com/project-chip/matter-rs/actions/workflows/test-linux-mbedtls.yml)
107

118
## Build
129

1310
Building the library:
11+
1412
```
15-
$ cd matter
1613
$ cargo build
1714
```
1815

1916
Building the example:
17+
2018
```
21-
$ cd matter
2219
$ RUST_LOG="matter" cargo run --example onoff_light
2320
```
2421

2522
With the chip-tool (the current tool for testing Matter) use the Ethernet commissioning mechanism:
23+
24+
```
25+
$ chip-tool pairing code 12344321 <Pairing-Code>
26+
```
27+
28+
Or alternatively:
29+
2630
```
2731
$ chip-tool pairing ethernet 12344321 123456 0 <IP-Address> 5540
2832
```
2933

3034
Interact with the device
35+
3136
```
3237
# Read server-list
3338
$ chip-tool descriptor read server-list 12344321 0
@@ -40,6 +45,7 @@ $ chip-tool onoff on 12344321 1
4045
```
4146

4247
## Functionality
48+
4349
- Secure Channel:
4450
- PASE
4551
- CASE
@@ -55,4 +61,3 @@ $ chip-tool onoff on 12344321 1
5561
## Notes
5662

5763
The matter-rs project is a work-in-progress and does NOT yet fully implement Matter.
58-

examples/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[workspace]
2+
members = ["*"]
3+
exclude = ["target", ".cargo"]
4+
resolver = "2"

matter/Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@ crypto_mbedtls = ["mbedtls"]
2121
crypto_esp_mbedtls = ["esp-idf-sys"]
2222

2323
[dependencies]
24-
boxslab = { path = "../boxslab"}
25-
matter_macro_derive = { path = "../matter_macro_derive"}
24+
boxslab = { path = "../boxslab" }
25+
matter_macro_derive = { path = "../matter_macro_derive" }
2626
bitflags = "1.3"
2727
byteorder = "1.4.3"
28-
heapless = {version = "0.7.7", features = ["x86-sync-pool"] }
29-
generic-array = "0.14.5"
30-
num = "0.3"
28+
heapless = { version = "0.7.16", features = ["x86-sync-pool"] }
29+
generic-array = "0.14.6"
30+
num = "0.4"
3131
num-derive = "0.3.3"
32-
num-traits = "0.2.14"
33-
log = { version = "0.4.14", features = ["max_level_debug", "release_max_level_debug"] }
34-
env_logger = "0.9.0"
35-
rand = "0.8.4"
36-
esp-idf-sys = { version = "0.30", features = ["binstart"], optional = true }
37-
openssl = { git = "https://github.com/sfackler/rust-openssl", optional = true}
38-
foreign-types = { version = "0.3.1", optional = true}
39-
sha2 = { version = "0.9.8", optional = true}
40-
hmac = { version = "0.11.0", optional = true}
41-
mbedtls = { git = "https://github.com/fortanix/rust-mbedtls", optional = true}
32+
num-traits = "0.2.15"
33+
log = { version = "0.4.17", features = ["max_level_debug", "release_max_level_debug"] }
34+
env_logger = "0.10.0"
35+
rand = "0.8.5"
36+
esp-idf-sys = { version = "0.32", features = ["binstart"], optional = true }
37+
openssl = { git = "https://github.com/sfackler/rust-openssl", optional = true }
38+
foreign-types = { version = "0.3.2", optional = true }
39+
sha2 = { version = "0.9.9", optional = true }
40+
hmac = { version = "0.11.0", optional = true }
41+
mbedtls = { git = "https://github.com/fortanix/rust-mbedtls", optional = true }
4242
subtle = "2.4.1"
4343
colored = "2.0.0"
44-
smol = "1.2.5"
44+
smol = "1.3.0"
4545
owning_ref = "0.4.1"
4646
safemem = "0.3.3"
47-
chrono = { version = "0.4.19", default-features = false, features = ["clock", "std"] }
48-
async-channel = "1.6"
47+
chrono = { version = "0.4.23", default-features = false, features = ["clock", "std"] }
48+
async-channel = "1.8"
4949

5050
# to compute the check digit
5151
verhoeff = "1"

0 commit comments

Comments
 (0)