From 63408cf8a3c988e63ed80a476728587e8d82fa35 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Thu, 11 Jan 2024 14:33:23 +0000 Subject: [PATCH] Update to `1.0.0` releases of `embedded-hal-*` packages (#1068) * Update to `1.0.0` releases of `embedded-hal-*` packages * Update `CHANGELOG.md` --- CHANGELOG.md | 3 +++ esp-hal-common/Cargo.toml | 12 ++++++--- esp-hal-common/src/gpio.rs | 53 ++++++++++--------------------------- esp-hal-smartled/Cargo.toml | 8 +++++- esp32-hal/Cargo.toml | 15 +++++++---- esp32c2-hal/Cargo.toml | 15 +++++++---- esp32c3-hal/Cargo.toml | 15 +++++++---- esp32c6-hal/Cargo.toml | 15 +++++++---- esp32h2-hal/Cargo.toml | 15 +++++++---- esp32s2-hal/Cargo.toml | 15 +++++++---- esp32s3-hal/Cargo.toml | 15 +++++++---- 11 files changed, 103 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11bf1e68c..141dd65d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Update to `1.0.0` releases of the `embedded-hal-*` packages (#1068) + ### Fixed - ESP32: correct gpio 32/33 in errata36() (#1053) @@ -26,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Breaking + - Unify the low-power peripheral names (`RTC_CNTL` and `LP_CLKRST` to `LPWR`) (#1064) ## [0.14.1] - 2023-12-13 diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index 26dee6d37..db89d65a1 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -23,8 +23,8 @@ defmt = { version = "=0.3.5", optional = true } 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-rc.2", optional = true, package = "embedded-hal" } -embedded-hal-nb = { version = "=1.0.0-rc.2", optional = true } +embedded-hal-1 = { version = "1.0.0", optional = true, package = "embedded-hal" } +embedded-hal-nb = { version = "1.0.0", optional = true } embedded-io = { version = "0.6.1", optional = true } enumset = "1.1.3" esp-synopsys-usb-otg = { version = "0.4.0", optional = true, features = ["fs", "esp32sx"] } @@ -40,7 +40,7 @@ void = { version = "1.0.2", default-features = false } usb-device = { version = "0.3.1", optional = true } # async -embedded-hal-async = { version = "=1.0.0-rc.2", optional = true } +embedded-hal-async = { version = "1.0.0", optional = true } embedded-io-async = { version = "0.6.1", optional = true } embassy-executor = { version = "0.4.0", optional = true } embassy-futures = { version = "0.1.1", optional = true } @@ -185,3 +185,9 @@ defmt = [ "embedded-io/defmt-03", "embedded-io-async?/defmt-03", ] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp-hal-common/src/gpio.rs b/esp-hal-common/src/gpio.rs index ec2a90da4..9f94ab0e7 100644 --- a/esp-hal-common/src/gpio.rs +++ b/esp-hal-common/src/gpio.rs @@ -569,10 +569,10 @@ impl embedded_hal_1::digital::InputPin for GpioPin Result { + fn is_high(&mut self) -> Result { Ok(::Bank::read_input() & (1 << (GPIONUM % 32)) != 0) } - fn is_low(&self) -> Result { + fn is_low(&mut self) -> Result { Ok(!self.is_high()?) } } @@ -583,10 +583,10 @@ where Self: GpioProperties, ::PinType: IsOutputPin, { - fn is_high(&self) -> Result { + fn is_high(&mut self) -> Result { Ok(::Bank::read_input() & (1 << (GPIONUM % 32)) != 0) } - fn is_low(&self) -> Result { + fn is_low(&mut self) -> Result { Ok(!self.is_high()?) } } @@ -918,31 +918,14 @@ where Self: GpioProperties, ::PinType: IsOutputPin, { - fn is_set_high(&self) -> Result { + fn is_set_high(&mut self) -> Result { Ok(::Bank::read_output() & (1 << (GPIONUM % 32)) != 0) } - fn is_set_low(&self) -> Result { + fn is_set_low(&mut self) -> Result { Ok(!self.is_set_high()?) } } -#[cfg(feature = "eh1")] -impl embedded_hal_1::digital::ToggleableOutputPin - for GpioPin, GPIONUM> -where - Self: GpioProperties, - ::PinType: IsOutputPin, -{ - fn toggle(&mut self) -> Result<(), Self::Error> { - use embedded_hal_1::digital::{OutputPin as _, StatefulOutputPin as _}; - if self.is_set_high()? { - Ok(self.set_low()?) - } else { - Ok(self.set_high()?) - } - } -} - impl crate::peripheral::Peripheral for GpioPin where Self: GpioProperties, @@ -1376,13 +1359,13 @@ impl embedded_hal_1::digital::ErrorType for AnyPin> { #[cfg(feature = "eh1")] impl embedded_hal_1::digital::InputPin for AnyPin> { - fn is_high(&self) -> Result { - let inner = &self.inner; + fn is_high(&mut self) -> Result { + let inner = &mut self.inner; handle_gpio_input!(inner, target, { target.is_high() }) } - fn is_low(&self) -> Result { - let inner = &self.inner; + fn is_low(&mut self) -> Result { + let inner = &mut self.inner; handle_gpio_input!(inner, target, { target.is_low() }) } } @@ -1442,22 +1425,14 @@ impl embedded_hal_1::digital::OutputPin for AnyPin> { #[cfg(feature = "eh1")] impl embedded_hal_1::digital::StatefulOutputPin for AnyPin> { - fn is_set_high(&self) -> Result { - let inner = &self.inner; + fn is_set_high(&mut self) -> Result { + let inner = &mut self.inner; handle_gpio_output!(inner, target, { target.is_set_high() }) } - fn is_set_low(&self) -> Result { - let inner = &self.inner; - handle_gpio_output!(inner, target, { target.is_set_low() }) - } -} - -#[cfg(feature = "eh1")] -impl embedded_hal_1::digital::ToggleableOutputPin for AnyPin> { - fn toggle(&mut self) -> Result<(), Self::Error> { + fn is_set_low(&mut self) -> Result { let inner = &mut self.inner; - handle_gpio_output!(inner, target, { target.toggle() }) + handle_gpio_output!(inner, target, { target.is_set_low() }) } } diff --git a/esp-hal-smartled/Cargo.toml b/esp-hal-smartled/Cargo.toml index e28085e3a..76631cf7a 100644 --- a/esp-hal-smartled/Cargo.toml +++ b/esp-hal-smartled/Cargo.toml @@ -12,7 +12,7 @@ features = ["esp32c3"] [dependencies] defmt = { version = "=0.3.5", optional = true } -esp-hal-common = { version = "0.14.0", path = "../esp-hal-common" } +esp-hal-common = { version = "0.14.1", path = "../esp-hal-common" } fugit = "0.3.7" smart-leds-trait = "0.2.1" @@ -28,3 +28,9 @@ xtal-26mhz = ["esp-hal-common/xtal-26mhz"] xtal-40mhz = ["esp-hal-common/xtal-40mhz"] defmt = ["dep:defmt", "esp-hal-common/defmt"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml index aed95b626..fab01b9d1 100644 --- a/esp32-hal/Cargo.toml +++ b/esp32-hal/Cargo.toml @@ -31,14 +31,14 @@ crypto-bigint = { version = "0.5.5", default-features = false } embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" esp-alloc = "0.3.0" -esp-backtrace = { version = "0.9.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] } +esp-backtrace = { version = "0.10.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32"] } +esp-println = { version = "0.8.0", features = ["esp32"] } heapless = "0.8.0" lis3dh-async = "0.8.0" sha2 = { version = "0.10.8", default-features = false} @@ -51,7 +51,7 @@ default = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"] async = ["esp-hal-common/async"] bluetooth = [] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] log = ["esp-hal-common/log", "esp-println/log"] @@ -143,3 +143,8 @@ required-features = ["embassy", "async"] [[example]] name = "embassy_i2s_read" required-features = ["embassy", "async"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml index 8d91e0755..798a72495 100644 --- a/esp32c2-hal/Cargo.toml +++ b/esp32c2-hal/Cargo.toml @@ -31,12 +31,12 @@ elliptic-curve = { version = "0.13.8", default-features = false, features = embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" -esp-backtrace = { version = "0.9.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] } -esp-println = { version = "0.7.1", features = ["esp32c2"] } +esp-backtrace = { version = "0.10.0", features = ["esp32c2", "panic-handler", "exception-handler", "print-uart"] } +esp-println = { version = "0.8.0", features = ["esp32c2"] } heapless = "0.8.0" hex-literal = "0.4.1" lis3dh-async = "0.8.0" @@ -50,7 +50,7 @@ static_cell = { version = "2.0.0", features = ["nightly"] } default = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] direct-vectoring = ["esp-hal-common/direct-vectoring"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] @@ -119,3 +119,8 @@ required-features = ["embassy", "async", "embassy-executor-thread"] [[example]] name = "direct-vectoring" required-features = ["direct-vectoring"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml index bec02766d..f99477b9a 100644 --- a/esp32c3-hal/Cargo.toml +++ b/esp32c3-hal/Cargo.toml @@ -34,13 +34,13 @@ embassy-sync = "0.5.0" 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-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" -esp-backtrace = { version = "0.9.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] } +esp-backtrace = { version = "0.10.0", features = ["esp32c3", "panic-handler", "exception-handler", "print-uart"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32c3"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32c3"] } +esp-println = { version = "0.8.0", features = ["esp32c3"] } heapless = "0.8.0" hmac = { version = "0.12.1", default-features = false } lis3dh-async = "0.8.0" @@ -53,7 +53,7 @@ static_cell = { version = "2.0.0", features = ["nightly"] } default = ["rt", "vectored", "zero-rtc-bss", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] direct-vectoring = ["esp-hal-common/direct-vectoring"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] @@ -145,3 +145,8 @@ required-features = ["embassy", "async", "embassy-executor-thread"] [[example]] name = "direct-vectoring" required-features = ["direct-vectoring"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32c6-hal/Cargo.toml b/esp32c6-hal/Cargo.toml index f3b991375..ec3fbc639 100644 --- a/esp32c6-hal/Cargo.toml +++ b/esp32c6-hal/Cargo.toml @@ -32,14 +32,14 @@ elliptic-curve = { version = "0.13.8", default-features = false, features = embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-can = "0.4.1" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" -esp-backtrace = { version = "0.9.0", features = ["esp32c6", "panic-handler", "exception-handler", "print-uart"] } +esp-backtrace = { version = "0.10.0", features = ["esp32c6", "panic-handler", "exception-handler", "print-uart"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32c6"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32c6"] } +esp-println = { version = "0.8.0", features = ["esp32c6"] } heapless = "0.8.0" hex-literal = "0.4.1" hmac = { version = "0.12.1", default-features = false } @@ -55,7 +55,7 @@ static_cell = { version = "2.0.0", features = ["nightly"] } default = ["rt", "vectored", "zero-rtc-bss", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] direct-vectoring = ["esp-hal-common/direct-vectoring"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] @@ -156,3 +156,8 @@ required-features = ["embassy", "async", "embassy-executor-thread"] [[example]] name = "embassy_usb_serial_jtag" required-features = ["embassy", "async", "embassy-executor-thread"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32h2-hal/Cargo.toml b/esp32h2-hal/Cargo.toml index 2d5a73934..aa3f32028 100644 --- a/esp32h2-hal/Cargo.toml +++ b/esp32h2-hal/Cargo.toml @@ -32,14 +32,14 @@ elliptic-curve = { version = "0.13.8", default-features = false, features = embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-can = "0.4.1" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" -esp-backtrace = { version = "0.9.0", features = ["esp32h2", "panic-handler", "exception-handler", "print-uart"] } +esp-backtrace = { version = "0.10.0", features = ["esp32h2", "panic-handler", "exception-handler", "print-uart"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32h2"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32h2"] } +esp-println = { version = "0.8.0", features = ["esp32h2"] } heapless = "0.8.0" hex-literal = "0.4.1" hmac = { version = "0.12.1", default-features = false } @@ -55,7 +55,7 @@ static_cell = { version = "2.0.0", features = ["nightly"] } default = ["rt", "vectored", "zero-rtc-bss", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] direct-vectoring = ["esp-hal-common/direct-vectoring"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] @@ -156,3 +156,8 @@ required-features = ["embassy", "async", "embassy-executor-thread"] [[example]] name = "embassy_usb_serial_jtag" required-features = ["embassy", "async", "embassy-executor-thread"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml index d3b929c96..e51705edc 100644 --- a/esp32s2-hal/Cargo.toml +++ b/esp32s2-hal/Cargo.toml @@ -31,14 +31,14 @@ crypto-bigint = { version = "0.5.5", default-features = false } embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" esp-alloc = "0.3.0" -esp-backtrace = { version = "0.9.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] } +esp-backtrace = { version = "0.10.0", features = ["esp32s2", "panic-handler", "print-uart", "exception-handler"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32s2"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32s2"] } +esp-println = { version = "0.8.0", features = ["esp32s2"] } # Xtensa targets are not auto detected to need atomic emulation in the futures-* crates. # As for how to remove this dep for good, see: https://github.com/rust-lang/futures-rs/pull/2805 futures-util = { version = "0.3.17", default-features = false, features = ["portable-atomic"] } @@ -56,7 +56,7 @@ usbd-serial = "0.2.0" default = ["rt", "vectored", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] eh1 = ["esp-hal-common/eh1"] embedded-io = ["esp-hal-common/embedded-io"] log = ["esp-hal-common/log", "esp-println/log"] @@ -139,3 +139,8 @@ required-features = ["embassy", "async"] [[example]] name = "embassy_i2s_read" required-features = ["embassy", "async"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml index 22cd1d742..2753f79ef 100644 --- a/esp32s3-hal/Cargo.toml +++ b/esp32s3-hal/Cargo.toml @@ -33,15 +33,15 @@ embassy-executor = { version = "0.4.0", features = ["nightly"] } embassy-sync = "0.5.0" embedded-graphics = "0.8.1" embedded-hal = { version = "0.2.7", features = ["unproven"] } -embedded-hal-1 = { version = "=1.0.0-rc.2", package = "embedded-hal" } -embedded-hal-async = "=1.0.0-rc.2" +embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" } +embedded-hal-async = "1.0.0" embedded-can = "0.4.1" embedded-io-async = "0.6.1" embedded-hal-bus = "0.1.0-rc.2" esp-alloc = "0.3.0" -esp-backtrace = { version = "0.9.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] } +esp-backtrace = { version = "0.10.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] } esp-hal-smartled = { version = "0.7.0", features = ["esp32s3"], path = "../esp-hal-smartled" } -esp-println = { version = "0.7.1", features = ["esp32s3"] } +esp-println = { version = "0.8.0", features = ["esp32s3"] } heapless = "0.8.0" hmac = { version = "0.12.1", default-features = false } lis3dh-async = "0.8.0" @@ -56,7 +56,7 @@ usbd-serial = "0.2.0" default = ["rt", "vectored", "embassy-integrated-timers"] async = ["esp-hal-common/async"] debug = ["esp-hal-common/debug"] -defmt = ["esp-hal-common/defmt", "esp-println/defmt"] +defmt = ["esp-hal-common/defmt", "esp-println/defmt-espflash"] embedded-io = ["esp-hal-common/embedded-io"] eh1 = ["esp-hal-common/eh1"] log = ["esp-hal-common/log", "esp-println/log"] @@ -161,3 +161,8 @@ required-features = ["embassy", "async"] [[example]] name = "embassy_usb_serial_jtag" required-features = ["embassy", "async"] + +[patch.crates-io] +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0027a76" }