Skip to content

Commit

Permalink
fixup! feat(device-id): Add to riot-rs and the archs
Browse files Browse the repository at this point in the history
This makes defmt optional on a crate level (curious to see whether CI
even catches the errors)
  • Loading branch information
chrysn committed Oct 18, 2024
1 parent 54cf02f commit 3d19b34
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions src/riot-rs-embassy-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ repository.workspace = true
workspace = true

[dependencies]
defmt = { workspace = true }
fugit = { workspace = true, optional = true, features = ["defmt"] }
defmt = { workspace = true, optional = true }
fugit = { workspace = true, optional = true }
embassy-futures = { workspace = true }
embassy-time = { workspace = true }
embedded-hal = { workspace = true }
Expand All @@ -23,3 +23,5 @@ external-interrupts = []

## Enables I2C support.
i2c = ["dep:fugit"]

defmt = ["dep:defmt", "fugit?/defmt"]
1 change: 1 addition & 0 deletions src/riot-rs-embassy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ defmt = [
"embassy-net?/defmt",
"embassy-time?/defmt",
"embassy-usb?/defmt",
"riot-rs-embassy-common/defmt",
"riot-rs-esp/defmt",
"riot-rs-nrf/defmt",
"riot-rs-rp/defmt",
Expand Down
5 changes: 2 additions & 3 deletions src/riot-rs-nrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true

[dependencies]
cfg-if = { workspace = true }
defmt = { workspace = true }
defmt = { workspace = true, optional = true }
embassy-executor = { workspace = true, default-features = false, features = [
"arch-cortex-m",
] }
Expand Down Expand Up @@ -61,8 +61,7 @@ i2c = ["riot-rs-embassy-common/i2c", "embassy-executor/integrated-timers"]
usb = []

## Enables defmt support.
# (at least in dependencies; the crate itself needs it for its DeviceId type)
defmt = ["embassy-nrf/defmt"]
defmt = ["dep:defmt", "embassy-nrf/defmt"]

## Enables the interrupt executor.
executor-interrupt = ["embassy-executor/executor-interrupt"]

0 comments on commit 3d19b34

Please sign in to comment.