Skip to content

Move mctp-usb-embassy into the workspace #16

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
merged 1 commit into from
Jul 29, 2025
Merged

Move mctp-usb-embassy into the workspace #16

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
60 changes: 60 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[workspace]
members = [ "pldm-fw-cli", "standalone" ]
exclude = [ "mctp-usb-embassy" ]
members = [ "mctp-usb-embassy", "pldm-fw-cli", "standalone" ]
resolver = "2"

[workspace.package]
Expand All @@ -20,7 +19,7 @@ enumset = "1.1"
env_logger = "0.11.3"
heapless = "0.8"
log = "0.4"
mctp-estack = { version = "0.1", path = "mctp-estack" }
mctp-estack = { version = "0.1", path = "mctp-estack", default-features = false }
mctp-linux = { version = "0.2", path = "mctp-linux" }
mctp = { version = "0.2", path = "mctp", default-features = false }
num-derive = { version = "0.4", default-features = false }
Expand Down
5 changes: 2 additions & 3 deletions ci/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,18 @@ for c in $NOSTD_CRATES; do
)
done

# mctp-estack combinations
# mctp-estack combinations, defmt and log
(
cd mctp-estack
cargo build --target thumbv7em-none-eabihf --features defmt --no-default-features
cargo build --features log
)

# not a workspace
# mctp-usb-embassy combinations, defmt and log
(
cd mctp-usb-embassy
cargo build --target thumbv7em-none-eabihf --features defmt --no-default-features
cargo build --features log
cargo doc
)

cargo doc --features mctp-estack/log
Expand Down
18 changes: 9 additions & 9 deletions mctp-usb-embassy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[package]
name = "mctp-usb-embassy"
description = "MCTP over USB transport for embassy-usb"
edition = "2021"
version = "0.1.0"
license = "MIT OR Apache-2.0"
repository = "https://github.com/CodeConstruct/mctp-rs"
edition.workspace = true
license.workspace = true
repository.workspace = true
categories = ["network-programming", "embedded", "no-std"]
rust-version = "1.82"

[dependencies]
defmt = { version = "0.3", optional = true }
defmt = { workspace = true, optional = true }
embassy-futures = { version = "0.1" }
embassy-usb-driver = { version = "0.2" }
embassy-usb = { version = "0.5" }
heapless = "0.8"
log = { version = "0.4", optional = true }
mctp-estack = { version = "0.1", path = "../mctp-estack", default-features = false }
mctp = { version = "0.2", path = "../mctp", default-features = false }
embassy-usb = { version = "0.5", default-features = false }
heapless = { workspace = true }
log = { workspace = true, optional = true }
mctp-estack = { workspace = true }
mctp = { workspace = true, default-features = false }

[features]
default = ["log"]
Expand Down
2 changes: 1 addition & 1 deletion standalone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories = ["network-programming"]
[dependencies]
embedded-io-async = { workspace = true }
log = { workspace = true }
mctp-estack = { workspace = true }
mctp-estack = { workspace = true, default-features = true }
mctp = { workspace = true }
smol = { workspace = true }

Expand Down