Skip to content

Update to 1.0.0-rc.1 version of embedded-hal-* crates #747

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
MabezDev merged 6 commits into from
Aug 22, 2023
Merged

Update to 1.0.0-rc.1 version of embedded-hal-* crates #747

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1319c82
Update a bunch of dependencies
jessebraham Aug 16, 2023
3613178
Implement `embedded-io` and `embedded-io-async` traits for USB Serial…
jessebraham Aug 21, 2023
386314f
Implement `embedded-io` and `embedded-io-async` traits for UART
jessebraham Aug 21, 2023
5eb4757
Fix `embassy_serial` examples
jessebraham Aug 21, 2023
054287c
Update CHANGELOG
jessebraham Aug 21, 2023
746067e
Address review comments
jessebraham Aug 22, 2023
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
Next Next commit
Update a bunch of dependencies
  • Loading branch information
@jessebraham
jessebraham committed Aug 21, 2023
commit 1319c825a03fb10366f5f9efc157f6f7e771b787
12 changes: 7 additions & 5 deletions esp-hal-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ critical-section = "1.1.2"
embedded-can = { version = "0.4.1", optional = true }
embedded-dma = "0.2.0"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
embedded-hal-1 = { version = "=1.0.0-alpha.11", optional = true, package = "embedded-hal" }
embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true }
embedded-hal-1 = { version = "=1.0.0-rc.1", optional = true, package = "embedded-hal" }
embedded-hal-nb = { version = "=1.0.0-rc.1", optional = true }
embedded-io = "0.5.0"
Copy link
Contributor

@bjoernQ bjoernQ Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be optional and only get included if we target eh1 / async?

Copy link
Member Author

@jessebraham jessebraham Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The embedded_io trait implementations are not feature gated currently. Should they be? I didn't see any reason to, they're not really following the 1.0.0-xxx release cycle of the other packages. But I can change this if there's a reason to.

Copy link
Contributor

@bjoernQ bjoernQ Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well we pull an unused dependency this way 🤷‍♂️

Copy link
Member Author

@jessebraham jessebraham Aug 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

embedded-hal and embedded-dma should both be optional too then, right? I'm not really sure where we're drawing the line here. I'm not against feature gating it, I'd just like to come up with actual criteria for this I guess.

Copy link
Contributor

@bjoernQ bjoernQ Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think code implementing embedded-hal and embedded-dma is not feature gated.
But embedded-hal-1 is and it's optional because of that.

esp-synopsys-usb-otg = { version = "0.3.2", optional = true, features = ["fs", "esp32sx"] }
fugit = "0.3.7"
log = "0.4.20"
Expand All @@ -33,9 +34,10 @@ void = { version = "1.0.2", default-features = false }
usb-device = { version = "0.2.9", optional = true }

# async
embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true }
embedded-hal-async = { version = "=1.0.0-rc.1", optional = true }
embedded-io-async = { version = "0.5.0", optional = true }
embassy-sync = { version = "0.2.0", optional = true }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }
embassy-futures = { version = "0.1.0", optional = true }

# RISC-V
Expand Down Expand Up @@ -97,7 +99,7 @@ ufmt = ["ufmt-write"]
vectored = ["procmacros/interrupt"]

# Implement the `embedded-hal-async==1.0.0-alpha.x` traits
async = ["embedded-hal-async", "eh1", "embassy-sync", "embassy-futures"]
async = ["embedded-hal-async", "eh1", "embassy-sync", "embassy-futures", "embedded-io-async"]
embassy = ["embassy-time"]

embassy-time-systick = []
Expand Down
8 changes: 4 additions & 4 deletions esp32-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }

[dev-dependencies]
aes = "0.8.3"
critical-section = "1.1.2"
crypto-bigint = { version = "0.5.2", default-features = false}
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.7.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32", "log"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32c2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32c2"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }

[dev-dependencies]
critical-section = "1.1.2"
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
esp-backtrace = { version = "0.7.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] }
esp-println = { version = "0.5.0", features = ["esp32c2"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
ssd1306 = "0.8.0"
static_cell = "1.2.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32c3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ categories = [
[dependencies]
cfg-if = "1.0.0"
esp-hal-common = { version = "0.11.0", features = ["esp32c3"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }

[dev-dependencies]
aes = "0.8.3"
Expand All @@ -37,13 +37,13 @@ embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-tim
embedded-can = "0.4.1"
embedded-graphics = "0.8.1"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
esp-backtrace = { version = "0.7.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32c3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32c3"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false }
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32c6-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32c6"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }

[dev-dependencies]
aes = "0.8.3"
critical-section = "1.1.2"
crypto-bigint = { version = "0.5.2", default-features = false}
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
embedded-can = "0.4.1"
esp-backtrace = { version = "0.7.0", features = ["esp32c6", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32c6"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32c6"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32h2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32h2"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }

[dev-dependencies]
aes = "0.8.3"
critical-section = "1.1.2"
crypto-bigint = { version = "0.5.2", default-features = false }
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-riscv32", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
embedded-can = "0.4.1"
esp-backtrace = { version = "0.7.0", features = ["esp32h2", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32h2"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32h2"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32s2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32s2"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }
xtensa-atomic-emulation-trap = "0.4.0"

[dev-dependencies]
Expand All @@ -35,14 +35,14 @@ critical-section = "1.1.2"
crypto-bigint = { version = "0.5.2", default-features = false}
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.7.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32s2"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32s2"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down
8 changes: 4 additions & 4 deletions esp32s3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ categories = [

[dependencies]
esp-hal-common = { version = "0.11.0", features = ["esp32s3"], path = "../esp-hal-common" }
embassy-time = { version = "0.1.2", features = ["nightly"], optional = true }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "4f453d7", features = ["nightly"], optional = true }
r0 = { version = "1.0.0", optional = true }

[dev-dependencies]
Expand All @@ -36,15 +36,15 @@ crypto-bigint = { version = "0.5.2", default-features = false}
embassy-executor = { version = "0.2.0", features = ["nightly", "integrated-timers", "arch-xtensa", "executor-thread"] }
embedded-graphics = "0.8.1"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
embedded-hal-1 = { version = "=1.0.0-alpha.11", package = "embedded-hal" }
embedded-hal-async = "=0.2.0-alpha.2"
embedded-hal-1 = { version = "=1.0.0-rc.1", package = "embedded-hal" }
embedded-hal-async = "=1.0.0-rc.1"
embedded-can = "0.4.1"
esp-alloc = "0.3.0"
esp-backtrace = { version = "0.7.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.4.0", features = ["esp32s3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.5.0", features = ["esp32s3", "log"] }
heapless = "0.7.16"
lis3dh-async = "0.7.0"
lis3dh-async = { git = "https://github.com/jessebraham/lis3dh-rs-async", branch = "feature/eh-rc1" }
sha2 = { version = "0.10.7", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.0"
Expand Down