Skip to content

Pull-in upstreamembedded-services changes #145

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
RobertZ2011 merged 1 commit into from
Sep 25, 2026
Merged

Pull-in upstreamembedded-services changes #145

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
74 changes: 37 additions & 37 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.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ pack1 = { version = "1.1.0", features = ["bytemuck"] }
heapless = { version = "0.9.2", optional = true }
itertools = { version = "0.14.0", default-features = false }
embedded-services = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
type-c-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
tcpm-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
fw-update-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
type-c-service = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
tcpm-service = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }
power-policy-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true }

[features]
Expand All @@ -47,9 +47,9 @@ defmt = [
"embassy-time?/defmt-timestamp-uptime",
"embedded-usb-pd/defmt",
"embedded-services?/defmt",
"type-c-interface?/defmt",
"tcpm-interface?/defmt",
"fw-update-interface?/defmt",
"type-c-service?/defmt",
"tcpm-service?/defmt",
]
embassy = ["dep:embassy-sync", "dep:embassy-time", "dep:heapless"]
log = ["dep:log"]
Expand All @@ -58,14 +58,14 @@ log = ["dep:log"]
odp-embedded-services = [
"embassy",
"dep:bitflags",
"dep:type-c-interface",
"dep:tcpm-interface",
"dep:embedded-services",
"dep:power-policy-interface",
]
# Enable fw-update-interface implementations
odp-fw-update-interface = ["odp-embedded-services", "dep:fw-update-interface"]
# Enable type-c-service implementations
odp-type-c-service = ["odp-embedded-services", "dep:type-c-service"]
# Enable tcpm-service implementations
odp-tcpm-service = ["odp-embedded-services", "dep:tcpm-service"]
Comment thread
RobertZ2011 marked this conversation as resolved.

[dev-dependencies]
critical-section = { version = "1.1", features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ $ device-driver-cli --manifest device.yaml --device-name Registers -o src/regist
## Integration with Other ODP crates
This crate provides implementations for traits defined in the `embedded-services` crate, gated behind these features:
* `odp-embedded-services` for core PD trait implementations.
* `odp-type-c-service` for code related to the ODP implementation of the type-C service.
* `odp-tcpm-service` for code related to the ODP implementation of the type-C service.
* `odp-fw-update-interface` for trait implementations for the fw-update-interface traits.
80 changes: 40 additions & 40 deletions examples/rt685s-evk/Cargo.lock
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions examples/rt685s-evk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ embedded-cfu-protocol = { git = "https://github.com/OpenDevicePartnership/embedd
embedded-services = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
"defmt",
] }
type-c-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
tcpm-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
"defmt",
] }
fw-update-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
"defmt",
] }
type-c-service = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
tcpm-service = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
"defmt",
] }
power-policy-interface = { git = "https://github.com/OpenDevicePartnership/embedded-services", optional = true, features = [
Expand All @@ -76,14 +76,14 @@ cfu-service = { git = "https://github.com/OpenDevicePartnership/embedded-service
default = []
odp = [
"dep:embedded-services",
"dep:type-c-interface",
"dep:tcpm-interface",
"dep:fw-update-interface",
"dep:type-c-service",
"dep:tcpm-service",
"dep:power-policy-interface",
"dep:power-policy-service",
"dep:cfu-service",
"dep:embedded-cfu-protocol",
"tps6699x/odp-type-c-service",
"tps6699x/odp-tcpm-service",
"tps6699x/odp-fw-update-interface",
]

Expand Down
Loading
Loading