Skip to content

Clean up cfg gating and prelude module #442

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 3 commits into from
Mar 20, 2023
Merged

Clean up cfg gating and prelude module #442

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9989d5b
Add additional `cfg` gates to re-exports in `esp-hal-common`
jessebraham Mar 17, 2023
fe74af0
Simplify the prelude, update its `cfg`s, and re-export some missing t…
jessebraham Mar 17, 2023
fb034bd
Update various dependencies
jessebraham Mar 17, 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
Prev Previous commit
Update various dependencies
  • Loading branch information
@jessebraham
jessebraham committed Mar 17, 2023
commit fb034bda9bb5a08ecebfc3bef840601a7676ecf7
4 changes: 2 additions & 2 deletions esp-hal-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ esp32s2 = { version = "0.13.0", features = ["critical-section"], optional = true
esp32s3 = { version = "0.16.0", features = ["critical-section"], optional = true }

[build-dependencies]
basic-toml = "0.1.1"
serde = { version = "1.0.152", features = ["derive"] }
basic-toml = "0.1.2"
serde = { version = "1.0.156", features = ["derive"] }

[features]
esp32 = ["esp32/rt" , "xtensa", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "lock_api", "procmacros/esp32"]
Expand Down
10 changes: 5 additions & 5 deletions esp-hal-procmacros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ license = "MIT OR Apache-2.0"
proc-macro = true

[dependencies]
darling = "0.14.3"
darling = "0.14.4"
proc-macro-crate = "1.3.1"
proc-macro-error = "1.0.4"
proc-macro2 = "1.0.51"
quote = "1.0.23"
syn = {version = "1.0.107", features = ["extra-traits", "full"]}
proc-macro-crate = "1.3.0"
proc-macro2 = "1.0.52"
quote = "1.0.26"
syn = {version = "1.0.109", features = ["extra-traits", "full"]}

[features]
interrupt = []
Expand Down
4 changes: 2 additions & 2 deletions esp32-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ embedded-hal-nb = { version = "=1.0.0-alpha.1", optional = true }
esp-hal-common = { version = "0.7.0", features = ["esp32"], path = "../esp-hal-common" }

[dev-dependencies]
aes = "0.8.2"
critical-section = "1.1.1"
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
embedded-graphics = "0.7.1"
esp-backtrace = { version = "0.6.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.1.0", features = ["esp32"], path = "../esp-hal-smartled" }
esp-println = { version = "0.3.1", features = ["esp32"] }
esp-println = { version = "0.4.0", features = ["esp32"] }
sha2 = { version = "0.10.6", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.7.1"
static_cell = "1.0.0"
aes = "0.8.2"

[features]
default = ["rt", "vectored", "xtal40mhz"]
Expand Down
2 changes: 1 addition & 1 deletion esp32c2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ critical-section = "1.1.1"
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
embedded-graphics = "0.7.1"
esp-backtrace = { version = "0.6.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] }
esp-println = { version = "0.3.1", features = ["esp32c2"] }
esp-println = { version = "0.4.0", features = ["esp32c2"] }
sha2 = { version = "0.10.6", default-features = false}
ssd1306 = "0.7.1"
static_cell = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion esp32c3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ embassy-executor = { package = "embassy-executor", git = "https://github.com/em
embedded-graphics = "0.7.1"
esp-backtrace = { version = "0.6.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.1.0", features = ["esp32c3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.3.1", features = ["esp32c3"] }
esp-println = { version = "0.4.0", features = ["esp32c3"] }
sha2 = { version = "0.10.6", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.7.1"
Expand Down
6 changes: 3 additions & 3 deletions esp32s2-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ esp-hal-common = { version = "0.7.0", features = ["esp32s2"], path = "../es
xtensa-atomic-emulation-trap = { version = "0.4.0" }

[dev-dependencies]
aes = "0.8.2"
critical-section = "1.1.1"
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
embedded-graphics = "0.7.1"
esp-backtrace = { version = "0.6.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] }
esp-hal-smartled = { version = "0.1.0", features = ["esp32s2"], path = "../esp-hal-smartled" }
esp-println = { version = "0.3.1", features = ["esp32s2"] }
esp-println = { version = "0.4.0", features = ["esp32s2"] }
sha2 = { version = "0.10.6", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.7.1"
static_cell = "1.0.0"
usb-device = { version = "0.2.9" }
usbd-serial = "0.1.1"
static_cell = "1.0.0"
aes = "0.8.2"

[features]
default = ["rt", "vectored"]
Expand Down
6 changes: 3 additions & 3 deletions esp32s3-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ esp-hal-common = { version = "0.7.0", features = ["esp32s3"], path = "../es
r0 = { version = "1.0.0", optional = true }

[dev-dependencies]
aes = "0.8.2"
critical-section = "1.1.1"
embassy-executor = { package = "embassy-executor", git = "https://github.com/embassy-rs/embassy/", rev = "cd9a65b", features = ["nightly", "integrated-timers"] }
embedded-graphics = "0.7.1"
esp-backtrace = { version = "0.6.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
esp-hal-smartled = { version = "0.1.0", features = ["esp32s3"], path = "../esp-hal-smartled" }
esp-println = { version = "0.3.1", features = ["esp32s3"] }
esp-println = { version = "0.4.0", features = ["esp32s3"] }
sha2 = { version = "0.10.6", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.7.1"
static_cell = "1.0.0"
usb-device = { version = "0.2.9" }
usbd-serial = "0.1.1"
static_cell = "1.0.0"
aes = "0.8.2"

[features]
default = ["rt", "vectored"]
Expand Down