From 7b593ae277c7db67cf21349e6a014b2edf1253e7 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 1 Oct 2025 21:17:46 +0200 Subject: [PATCH] Update to embedded-io 0.7 --- cyw43/Cargo.toml | 4 +-- cyw43/src/bluetooth.rs | 8 +++++ embassy-imxrt/Cargo.toml | 4 +-- embassy-mspm0/Cargo.toml | 4 +-- embassy-mspm0/src/uart/buffered.rs | 4 +++ embassy-net-nrf91/Cargo.toml | 2 +- embassy-net-ppp/Cargo.toml | 2 +- embassy-net/Cargo.toml | 4 +-- embassy-net/src/tcp.rs | 16 +++++++++ embassy-nrf/Cargo.toml | 4 +-- embassy-nrf/src/buffered_uarte.rs | 7 ++++ embassy-nrf/src/uarte.rs | 20 +++++++++++ embassy-nxp/Cargo.toml | 2 +- embassy-nxp/src/usart/lpc55.rs | 9 +++++ embassy-rp/Cargo.toml | 4 +-- embassy-rp/src/pio_programs/uart.rs | 4 +++ embassy-rp/src/uart/mod.rs | 8 +++++ embassy-stm32/Cargo.toml | 6 ++-- embassy-sync/Cargo.toml | 2 +- embassy-usb-driver/Cargo.toml | 1 + embassy-usb-driver/src/lib.rs | 1 + embassy-usb/Cargo.toml | 2 +- embassy-usb/src/class/cdc_acm.rs | 52 +++++++++++++++++++++++++---- examples/mspm0g3507/Cargo.toml | 2 +- examples/nrf52840/Cargo.toml | 4 +-- examples/nrf5340/Cargo.toml | 2 +- examples/nrf9160/Cargo.toml | 4 +-- examples/rp/Cargo.toml | 2 +- examples/rp235x/Cargo.toml | 2 +- examples/std/Cargo.toml | 4 +-- examples/stm32f4/Cargo.toml | 4 +-- examples/stm32f7/Cargo.toml | 2 +- examples/stm32g0/Cargo.toml | 2 +- examples/stm32h5/Cargo.toml | 4 +-- examples/stm32h7/Cargo.toml | 4 +-- examples/stm32h723/Cargo.toml | 4 +-- examples/stm32h742/Cargo.toml | 2 +- examples/stm32h755cm4/Cargo.toml | 4 +-- examples/stm32h755cm7/Cargo.toml | 4 +-- examples/stm32h7b0/Cargo.toml | 4 +-- examples/stm32h7rs/Cargo.toml | 4 +-- examples/stm32l0/Cargo.toml | 4 +-- examples/stm32l4/Cargo.toml | 4 +-- examples/stm32l5/Cargo.toml | 2 +- tests/mspm0/Cargo.toml | 4 +-- tests/nrf/Cargo.toml | 2 +- tests/rp/Cargo.toml | 2 +- 47 files changed, 182 insertions(+), 64 deletions(-) diff --git a/cyw43/Cargo.toml b/cyw43/Cargo.toml index 3144276115..dd72465a8c 100644 --- a/cyw43/Cargo.toml +++ b/cyw43/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/embassy-rs/embassy" documentation = "https://docs.embassy.dev/cyw43" [features] -defmt = ["dep:defmt", "heapless/defmt-03", "embassy-time/defmt", "bt-hci?/defmt", "embedded-io-async?/defmt-03"] +defmt = ["dep:defmt", "heapless/defmt-03", "embassy-time/defmt", "bt-hci?/defmt", "embedded-io-async?/defmt"] log = ["dep:log"] bluetooth = ["dep:bt-hci", "dep:embedded-io-async"] @@ -35,7 +35,7 @@ num_enum = { version = "0.5.7", default-features = false } heapless = "0.8.0" # Bluetooth deps -embedded-io-async = { version = "0.6.0", optional = true } +embedded-io-async = { version = "0.7.0", optional = true } bt-hci = { version = "0.6.0", optional = true } [package.metadata.embassy] diff --git a/cyw43/src/bluetooth.rs b/cyw43/src/bluetooth.rs index 332b7048d7..256451fae5 100644 --- a/cyw43/src/bluetooth.rs +++ b/cyw43/src/bluetooth.rs @@ -490,6 +490,14 @@ impl From for Error { } } +impl core::fmt::Display for Error { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + core::fmt::Debug::fmt(self, f) + } +} + +impl core::error::Error for Error {} + impl<'d> embedded_io_async::ErrorType for BtDriver<'d> { type Error = Error; } diff --git a/embassy-imxrt/Cargo.toml b/embassy-imxrt/Cargo.toml index c47756f102..1aca545197 100644 --- a/embassy-imxrt/Cargo.toml +++ b/embassy-imxrt/Cargo.toml @@ -85,8 +85,8 @@ cfg-if = "1.0.0" cortex-m-rt = ">=0.7.3,<0.8" cortex-m = "0.7.6" critical-section = "1.1" -embedded-io = { version = "0.6.1" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } fixed = "1.23.1" rand-core-06 = { package = "rand_core", version = "0.6" } diff --git a/embassy-mspm0/Cargo.toml b/embassy-mspm0/Cargo.toml index 65019eb7ca..f2bcdeb833 100644 --- a/embassy-mspm0/Cargo.toml +++ b/embassy-mspm0/Cargo.toml @@ -58,8 +58,8 @@ embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["un embedded-hal = { version = "1.0" } embedded-hal-nb = { version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-io = "0.6.1" -embedded-io-async = "0.6.1" +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } defmt = { version = "1.0.1", optional = true } fixed = "1.29" diff --git a/embassy-mspm0/src/uart/buffered.rs b/embassy-mspm0/src/uart/buffered.rs index 89e6bcc7b0..d1b75b177c 100644 --- a/embassy-mspm0/src/uart/buffered.rs +++ b/embassy-mspm0/src/uart/buffered.rs @@ -436,6 +436,10 @@ impl embedded_io_async::Write for BufferedUart<'_> { async fn write(&mut self, buf: &[u8]) -> Result { self.tx.write_inner(buf).await } + + async fn flush(&mut self) -> Result<(), Self::Error> { + self.tx.flush_inner().await + } } impl embedded_io_async::Write for BufferedUartTx<'_> { diff --git a/embassy-net-nrf91/Cargo.toml b/embassy-net-nrf91/Cargo.toml index ecb10246af..427b9f5354 100644 --- a/embassy-net-nrf91/Cargo.toml +++ b/embassy-net-nrf91/Cargo.toml @@ -27,7 +27,7 @@ embassy-futures = { version = "0.1.2", path = "../embassy-futures" } embassy-net-driver-channel = { version = "0.3.2", path = "../embassy-net-driver-channel" } heapless = "0.8" -embedded-io = "0.6.1" +embedded-io = { version = "0.7.1" } at-commands = "0.5.4" [package.metadata.embassy] diff --git a/embassy-net-ppp/Cargo.toml b/embassy-net-ppp/Cargo.toml index 45ee2f6b57..1dda5017fd 100644 --- a/embassy-net-ppp/Cargo.toml +++ b/embassy-net-ppp/Cargo.toml @@ -17,7 +17,7 @@ log = ["dep:log", "ppproto/log"] defmt = { version = "1.0.1", optional = true } log = { version = "0.4.14", optional = true } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } embassy-net-driver-channel = { version = "0.3.2", path = "../embassy-net-driver-channel" } embassy-futures = { version = "0.1.2", path = "../embassy-futures" } ppproto = { version = "0.2.1"} diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index 4c8075c430..d66ba11335 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml @@ -109,9 +109,9 @@ smoltcp = { version = "0.12.0", default-features = false, features = [ embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } embassy-time = { version = "0.5.0", path = "../embassy-time" } embassy-sync = { version = "0.7.2", path = "../embassy-sync" } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } managed = { version = "0.8.0", default-features = false, features = [ "map" ] } heapless = { version = "0.8", default-features = false } -embedded-nal-async = "0.8.0" +embedded-nal-async = "0.9.0" document-features = "0.2.7" diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs index 6792c55263..f197e114a8 100644 --- a/embassy-net/src/tcp.rs +++ b/embassy-net/src/tcp.rs @@ -656,6 +656,13 @@ impl<'d> TcpIo<'d> { mod embedded_io_impls { use super::*; + impl core::fmt::Display for ConnectError { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + f.write_str("ConnectError") + } + } + impl core::error::Error for ConnectError {} + impl embedded_io_async::Error for ConnectError { fn kind(&self) -> embedded_io_async::ErrorKind { match self { @@ -667,6 +674,15 @@ mod embedded_io_impls { } } + impl core::fmt::Display for Error { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match self { + Self::ConnectionReset => f.write_str("ConnectionReset"), + } + } + } + impl core::error::Error for Error {} + impl embedded_io_async::Error for Error { fn kind(&self) -> embedded_io_async::ErrorKind { match self { diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index 17ffaf439e..f74c1a3019 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml @@ -191,8 +191,8 @@ embassy-futures = { version = "0.1.2", path = "../embassy-futures", optional = t embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-io = { version = "0.6.0" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } rand-core-06 = { package = "rand_core", version = "0.6" } rand-core-09 = { package = "rand_core", version = "0.9" } diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs index 4c946497d9..7540caa11d 100644 --- a/embassy-nrf/src/buffered_uarte.rs +++ b/embassy-nrf/src/buffered_uarte.rs @@ -849,6 +849,13 @@ impl<'a> Drop for BufferedUarteRx<'a> { } } +impl core::fmt::Display for Error { + fn fmt(&self, _f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match *self {} + } +} +impl core::error::Error for Error {} + mod _embedded_io { use super::*; diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 1ee4521732..c9b8eb251b 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs @@ -1056,6 +1056,20 @@ mod eh02 { } } +impl core::fmt::Display for Error { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match *self { + Self::BufferTooLong => f.write_str("BufferTooLong"), + Self::BufferNotInRAM => f.write_str("BufferNotInRAM"), + Self::Framing => f.write_str("Framing"), + Self::Parity => f.write_str("Parity"), + Self::Overrun => f.write_str("Overrun"), + Self::Break => f.write_str("Break"), + } + } +} +impl core::error::Error for Error {} + mod _embedded_io { use super::*; @@ -1085,6 +1099,9 @@ mod _embedded_io { self.write(buf).await?; Ok(buf.len()) } + async fn flush(&mut self) -> Result<(), Self::Error> { + Ok(()) + } } impl<'d> embedded_io_async::Write for UarteTx<'d> { @@ -1092,5 +1109,8 @@ mod _embedded_io { self.write(buf).await?; Ok(buf.len()) } + async fn flush(&mut self) -> Result<(), Self::Error> { + Ok(()) + } } } diff --git a/embassy-nxp/Cargo.toml b/embassy-nxp/Cargo.toml index 33f0f2dff5..99640e3375 100644 --- a/embassy-nxp/Cargo.toml +++ b/embassy-nxp/Cargo.toml @@ -35,7 +35,7 @@ log = { version = "0.4.27", optional = true } embassy-time = { version = "0.5.0", path = "../embassy-time", optional = true } embassy-time-driver = { version = "0.2.1", path = "../embassy-time-driver", optional = true } embassy-time-queue-utils = { version = "0.3.0", path = "../embassy-time-queue-utils", optional = true } -embedded-io = "0.6.1" +embedded-io = { version = "0.7.1" } embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } ## Chip dependencies nxp-pac = { version = "0.1.0", optional = true, git = "https://github.com/i509VCB/nxp-pac", rev = "b736e3038254d593024aaa1a5a7b1f95a5728538"} diff --git a/embassy-nxp/src/usart/lpc55.rs b/embassy-nxp/src/usart/lpc55.rs index 0be5a8ce77..f4df2954e5 100644 --- a/embassy-nxp/src/usart/lpc55.rs +++ b/embassy-nxp/src/usart/lpc55.rs @@ -49,6 +49,15 @@ impl embedded_io::Error for Error { } } } + +impl core::fmt::Display for Error { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + core::fmt::Debug::fmt(self, f) + } +} + +impl core::error::Error for Error {} + /// Word length. #[derive(Clone, Copy, PartialEq, Eq, Debug)] pub enum DataBits { diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index 9ad4b47a33..104eb7324d 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml @@ -168,8 +168,8 @@ cortex-m-rt = ">=0.6.15,<0.8" cortex-m = "0.7.6" critical-section = "1.2.0" chrono = { version = "0.4", default-features = false, optional = true } -embedded-io = { version = "0.6.1" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } embedded-storage = { version = "0.3" } embedded-storage-async = { version = "0.4.1" } fixed = "1.28.0" diff --git a/embassy-rp/src/pio_programs/uart.rs b/embassy-rp/src/pio_programs/uart.rs index 444efb5db5..eb032426e4 100644 --- a/embassy-rp/src/pio_programs/uart.rs +++ b/embassy-rp/src/pio_programs/uart.rs @@ -90,6 +90,10 @@ impl Write for PioUartTx<'_, PIO, SM> { } Ok(buf.len()) } + + async fn flush(&mut self) -> Result<(), Infallible> { + Ok(()) + } } /// This struct represents a Uart Rx program loaded into pio instruction memory. diff --git a/embassy-rp/src/uart/mod.rs b/embassy-rp/src/uart/mod.rs index 43187df2d7..ca0494758c 100644 --- a/embassy-rp/src/uart/mod.rs +++ b/embassy-rp/src/uart/mod.rs @@ -118,6 +118,14 @@ pub enum Error { Framing, } +impl core::fmt::Display for Error { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + core::fmt::Debug::fmt(self, f) + } +} + +impl core::error::Error for Error {} + /// Read To Break error #[derive(Debug, Eq, PartialEq, Copy, Clone)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 7c243b3503..ad2d8a1b32 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -184,8 +184,8 @@ vcell = "0.1.3" nb = "1.0.0" stm32-fmc = "0.3.0" cfg-if = "1.0.0" -embedded-io = { version = "0.6.0" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } chrono = { version = "^0.4", default-features = false, optional = true } bit_field = "0.10.2" document-features = "0.2.7" @@ -222,7 +222,7 @@ defmt = [ "embassy-sync/defmt", "embassy-embedded-hal/defmt", "embassy-hal-internal/defmt", - "embedded-io-async/defmt-03", + "embedded-io-async/defmt", "embassy-usb-driver/defmt", "embassy-net-driver/defmt", "embassy-time?/defmt", diff --git a/embassy-sync/Cargo.toml b/embassy-sync/Cargo.toml index 0c28cec7d6..86c87b7b15 100644 --- a/embassy-sync/Cargo.toml +++ b/embassy-sync/Cargo.toml @@ -41,7 +41,7 @@ futures-core = { version = "0.3.31", default-features = false } critical-section = "1.1" heapless = "0.8" cfg-if = "1.0.0" -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } [dev-dependencies] futures-executor = { version = "0.3.17", features = [ "thread-pool" ] } diff --git a/embassy-usb-driver/Cargo.toml b/embassy-usb-driver/Cargo.toml index 3f43f60a3e..a116582130 100644 --- a/embassy-usb-driver/Cargo.toml +++ b/embassy-usb-driver/Cargo.toml @@ -19,6 +19,7 @@ target = "thumbv7em-none-eabi" features = ["defmt"] [dependencies] +# TODO: remove before releasing embassy-usb-driver v0.3 embedded-io-async = "0.6.1" defmt = { version = "1", optional = true } diff --git a/embassy-usb-driver/src/lib.rs b/embassy-usb-driver/src/lib.rs index f19e0a4015..782f130f64 100644 --- a/embassy-usb-driver/src/lib.rs +++ b/embassy-usb-driver/src/lib.rs @@ -429,6 +429,7 @@ pub enum EndpointError { Disabled, } +// TODO: remove before releasing embassy-usb-driver v0.3 impl embedded_io_async::Error for EndpointError { fn kind(&self) -> embedded_io_async::ErrorKind { match self { diff --git a/embassy-usb/Cargo.toml b/embassy-usb/Cargo.toml index aeb7392f12..8b95161bc5 100644 --- a/embassy-usb/Cargo.toml +++ b/embassy-usb/Cargo.toml @@ -66,7 +66,7 @@ embassy-net-driver-channel = { version = "0.3.2", path = "../embassy-net-driver- defmt = { version = "1", optional = true } log = { version = "0.4.14", optional = true } heapless = "0.8" -embedded-io-async = "0.6.1" +embedded-io-async = { version = "0.7.0" } # for HID usbd-hid = { version = "0.8.1", optional = true } diff --git a/embassy-usb/src/class/cdc_acm.rs b/embassy-usb/src/class/cdc_acm.rs index 388e21fbdb..d4bc72aac8 100644 --- a/embassy-usb/src/class/cdc_acm.rs +++ b/embassy-usb/src/class/cdc_acm.rs @@ -33,6 +33,30 @@ const REQ_SET_LINE_CODING: u8 = 0x20; const REQ_GET_LINE_CODING: u8 = 0x21; const REQ_SET_CONTROL_LINE_STATE: u8 = 0x22; +/// CDC ACM error. +#[derive(Clone, Debug)] +pub enum CdcAcmError { + /// USB is not connected. + NotConnected, +} + +impl core::fmt::Display for CdcAcmError { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match *self { + Self::NotConnected => f.write_str("NotConnected"), + } + } +} + +impl core::error::Error for CdcAcmError {} +impl embedded_io_async::Error for CdcAcmError { + fn kind(&self) -> embedded_io_async::ErrorKind { + match *self { + Self::NotConnected => embedded_io_async::ErrorKind::NotConnected, + } + } +} + /// Internal state for CDC-ACM pub struct State<'a> { control: MaybeUninit>, @@ -411,14 +435,21 @@ impl<'d, D: Driver<'d>> Sender<'d, D> { } impl<'d, D: Driver<'d>> embedded_io_async::ErrorType for Sender<'d, D> { - type Error = EndpointError; + type Error = CdcAcmError; } impl<'d, D: Driver<'d>> embedded_io_async::Write for Sender<'d, D> { async fn write(&mut self, buf: &[u8]) -> Result { let len = core::cmp::min(buf.len(), self.max_packet_size() as usize); - self.write_packet(&buf[..len]).await?; - Ok(len) + match self.write_packet(&buf[..len]).await { + Ok(()) => Ok(len), + Err(EndpointError::BufferOverflow) => unreachable!(), + Err(EndpointError::Disabled) => Err(CdcAcmError::NotConnected), + } + } + + async fn flush(&mut self) -> Result<(), Self::Error> { + Ok(()) } } @@ -529,7 +560,7 @@ impl<'d, D: Driver<'d>> BufferedReceiver<'d, D> { } impl<'d, D: Driver<'d>> embedded_io_async::ErrorType for BufferedReceiver<'d, D> { - type Error = EndpointError; + type Error = CdcAcmError; } impl<'d, D: Driver<'d>> embedded_io_async::Read for BufferedReceiver<'d, D> { @@ -542,12 +573,21 @@ impl<'d, D: Driver<'d>> embedded_io_async::Read for BufferedReceiver<'d, D> { // If the caller's buffer is large enough to contain an entire packet, read directly into // that instead of buffering the packet internally. if buf.len() > self.receiver.max_packet_size() as usize { - return self.receiver.read_packet(buf).await; + return match self.receiver.read_packet(buf).await { + Ok(n) => Ok(n), + Err(EndpointError::BufferOverflow) => unreachable!(), + Err(EndpointError::Disabled) => Err(CdcAcmError::NotConnected), + }; } // Otherwise read a packet into the internal buffer, and return some of it to the caller self.start = 0; - self.end = self.receiver.read_packet(&mut self.buffer).await?; + self.end = 0; + match self.receiver.read_packet(&mut self.buffer).await { + Ok(n) => self.end = n, + Err(EndpointError::BufferOverflow) => unreachable!(), + Err(EndpointError::Disabled) => return Err(CdcAcmError::NotConnected), + } return Ok(self.read_from_buffer(buf)); } } diff --git a/examples/mspm0g3507/Cargo.toml b/examples/mspm0g3507/Cargo.toml index 8c230f038a..f4fc7e09fe 100644 --- a/examples/mspm0g3507/Cargo.toml +++ b/examples/mspm0g3507/Cargo.toml @@ -18,7 +18,7 @@ defmt-rtt = "1.0.0" panic-probe = { version = "1.0.0", features = ["print-defmt"] } panic-semihosting = "0.6.0" -embedded-io-async = "0.6.1" +embedded-io-async = { version = "0.7.0" } [profile.release] debug = 2 diff --git a/examples/nrf52840/Cargo.toml b/examples/nrf52840/Cargo.toml index a026d63524..e2e25f0d4c 100644 --- a/examples/nrf52840/Cargo.toml +++ b/examples/nrf52840/Cargo.toml @@ -13,8 +13,8 @@ embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["de embassy-nrf = { version = "0.8.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time", "net-driver"] } embassy-net = { version = "0.7.1", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet","udp", "medium-ieee802154", "proto-ipv6"] } embassy-usb = { version = "0.5.1", path = "../../embassy-usb", features = ["defmt"] } -embedded-io = { version = "0.6.0", features = ["defmt-03"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io = { version = "0.7.1", features = ["defmt"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } embassy-net-esp-hosted = { version = "0.2.1", path = "../../embassy-net-esp-hosted", features = ["defmt"] } embassy-net-enc28j60 = { version = "0.2.1", path = "../../embassy-net-enc28j60", features = ["defmt"] } diff --git a/examples/nrf5340/Cargo.toml b/examples/nrf5340/Cargo.toml index 4dcbdd715a..d4e1d5e4b2 100644 --- a/examples/nrf5340/Cargo.toml +++ b/examples/nrf5340/Cargo.toml @@ -13,7 +13,7 @@ embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["de embassy-nrf = { version = "0.8.0", path = "../../embassy-nrf", features = ["defmt", "nrf5340-app-s", "time-driver-rtc1", "gpiote", "unstable-pac"] } embassy-net = { version = "0.7.1", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"] } embassy-usb = { version = "0.5.1", path = "../../embassy-usb", features = ["defmt"] } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } defmt = "1.0.1" defmt-rtt = "1.0.0" diff --git a/examples/nrf9160/Cargo.toml b/examples/nrf9160/Cargo.toml index ae3b2eeb17..c632cf8c35 100644 --- a/examples/nrf9160/Cargo.toml +++ b/examples/nrf9160/Cargo.toml @@ -20,8 +20,8 @@ cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-sing cortex-m-rt = "0.7.0" panic-probe = { version = "1.0.0", features = ["print-defmt"] } static_cell = { version = "2" } -embedded-io = "0.6.1" -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } [profile.release] debug = 2 diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index 640addb280..9df5ec156e 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml @@ -50,7 +50,7 @@ usbd-hid = "0.8.1" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = "1.0" embedded-hal-bus = { version = "0.1", features = ["async"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } embedded-storage = { version = "0.3" } static_cell = "2.1" portable-atomic = { version = "1.5", features = ["critical-section"] } diff --git a/examples/rp235x/Cargo.toml b/examples/rp235x/Cargo.toml index 39a4f421a5..80b76e9fd8 100644 --- a/examples/rp235x/Cargo.toml +++ b/examples/rp235x/Cargo.toml @@ -51,7 +51,7 @@ usbd-hid = "0.8.1" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = "1.0" embedded-hal-bus = { version = "0.1", features = ["async"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } embedded-storage = { version = "0.3" } static_cell = "2.1" portable-atomic = { version = "1.5", features = ["critical-section"] } diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml index 6dc6a353d0..2348271c85 100644 --- a/examples/std/Cargo.toml +++ b/examples/std/Cargo.toml @@ -12,8 +12,8 @@ embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["lo embassy-net = { version = "0.7.1", path = "../../embassy-net", features=[ "log", "medium-ethernet", "medium-ip", "tcp", "udp", "dns", "dhcpv4", "proto-ipv6"] } embassy-net-tuntap = { version = "0.1.0", path = "../../embassy-net-tuntap" } embassy-net-ppp = { version = "0.2.1", path = "../../embassy-net-ppp", features = ["log"]} -embedded-io-async = { version = "0.6.1" } -embedded-io-adapters = { version = "0.6.1", features = ["futures-03"] } +embedded-io-async = { version = "0.7.0" } +embedded-io-adapters = { version = "0.7.0", features = ["futures-03"] } critical-section = { version = "1.1", features = ["std"] } async-io = "1.6.0" diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index d06b7505c5..138ed2000c 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml @@ -23,8 +23,8 @@ cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-sing cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-bus = { version = "0.2", features = ["async"] } -embedded-io = { version = "0.6.0" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } futures-util = { version = "0.3.30", default-features = false } heapless = { version = "0.8", default-features = false } diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index 5652773949..a952b770b3 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml @@ -12,7 +12,7 @@ embassy-sync = { version = "0.7.2", path = "../../embassy-sync", features = ["de embassy-executor = { version = "0.9.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt"] } embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } embassy-net = { version = "0.7.1", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"] } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } embassy-usb = { version = "0.5.0", path = "../../embassy-usb", features = ["defmt"] } embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } diff --git a/examples/stm32g0/Cargo.toml b/examples/stm32g0/Cargo.toml index 16f28500df..a25a01e598 100644 --- a/examples/stm32g0/Cargo.toml +++ b/examples/stm32g0/Cargo.toml @@ -24,7 +24,7 @@ panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } portable-atomic = { version = "1.5", features = ["unsafe-assume-single-core"] } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } [profile.release] debug = 2 diff --git a/examples/stm32h5/Cargo.toml b/examples/stm32h5/Cargo.toml index 475ba7e8a1..e7031476dd 100644 --- a/examples/stm32h5/Cargo.toml +++ b/examples/stm32h5/Cargo.toml @@ -23,8 +23,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-io-async = { version = "0.6.1" } -embedded-nal-async = "0.8.0" +embedded-io-async = { version = "0.7.0" } +embedded-nal-async = "0.9.0" panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index 5993110de0..c745db5199 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml @@ -24,8 +24,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h723/Cargo.toml b/examples/stm32h723/Cargo.toml index 93a5109e2c..8b3f8dc55a 100644 --- a/examples/stm32h723/Cargo.toml +++ b/examples/stm32h723/Cargo.toml @@ -21,8 +21,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h742/Cargo.toml b/examples/stm32h742/Cargo.toml index 9b5e5d93dd..7ff4dfbe4a 100644 --- a/examples/stm32h742/Cargo.toml +++ b/examples/stm32h742/Cargo.toml @@ -33,7 +33,7 @@ embassy-net = { version = "0.7.1", path = "../../embassy-net", features = [ "dhcpv4", "medium-ethernet", ] } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } embassy-usb = { version = "0.5.1", path = "../../embassy-usb", features = [ "defmt", ] } diff --git a/examples/stm32h755cm4/Cargo.toml b/examples/stm32h755cm4/Cargo.toml index b5c3135236..0308748c0f 100644 --- a/examples/stm32h755cm4/Cargo.toml +++ b/examples/stm32h755cm4/Cargo.toml @@ -24,8 +24,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h755cm7/Cargo.toml b/examples/stm32h755cm7/Cargo.toml index 7a1519aae0..b8ce1bd86d 100644 --- a/examples/stm32h755cm7/Cargo.toml +++ b/examples/stm32h755cm7/Cargo.toml @@ -24,8 +24,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h7b0/Cargo.toml b/examples/stm32h7b0/Cargo.toml index 4cd7b84e5f..856d6a89d6 100644 --- a/examples/stm32h7b0/Cargo.toml +++ b/examples/stm32h7b0/Cargo.toml @@ -23,8 +23,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32h7rs/Cargo.toml b/examples/stm32h7rs/Cargo.toml index 4459169721..7d44ae0198 100644 --- a/examples/stm32h7rs/Cargo.toml +++ b/examples/stm32h7rs/Cargo.toml @@ -23,8 +23,8 @@ cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-nal-async = "0.8.0" -embedded-io-async = { version = "0.6.1" } +embedded-nal-async = "0.9.0" +embedded-io-async = { version = "0.7.0" } panic-probe = { version = "1.0.0", features = ["print-defmt"] } heapless = { version = "0.8", default-features = false } critical-section = "1.1" diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index a9c71d655a..c06c761c9b 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml @@ -18,8 +18,8 @@ defmt = "1.0.1" defmt-rtt = "1.0.0" embedded-storage = "0.3.1" -embedded-io = { version = "0.6.0" } -embedded-io-async = { version = "0.6.1" } +embedded-io = { version = "0.7.1" } +embedded-io-async = { version = "0.7.0" } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml index 9364721992..995c8c694e 100644 --- a/examples/stm32l4/Cargo.toml +++ b/examples/stm32l4/Cargo.toml @@ -16,8 +16,8 @@ embassy-usb = { version = "0.5.0", path = "../../embassy-usb", features = ["defm embassy-net-adin1110 = { version = "0.3.1", path = "../../embassy-net-adin1110" } embassy-net = { version = "0.7.1", path = "../../embassy-net", features = ["defmt", "udp", "tcp", "dhcpv4", "medium-ethernet"] } embassy-futures = { version = "0.1.2", path = "../../embassy-futures" } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } -embedded-io = { version = "0.6.0", features = ["defmt-03"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } +embedded-io = { version = "0.7.1", features = ["defmt"] } defmt = "1.0.1" defmt-rtt = "1.0.0" diff --git a/examples/stm32l5/Cargo.toml b/examples/stm32l5/Cargo.toml index b6158c854c..b1373a6a05 100644 --- a/examples/stm32l5/Cargo.toml +++ b/examples/stm32l5/Cargo.toml @@ -24,7 +24,7 @@ cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-sing cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" heapless = { version = "0.8", default-features = false } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } static_cell = "2" [profile.release] diff --git a/tests/mspm0/Cargo.toml b/tests/mspm0/Cargo.toml index df52b538d4..56b027feb7 100644 --- a/tests/mspm0/Cargo.toml +++ b/tests/mspm0/Cargo.toml @@ -26,8 +26,8 @@ cortex-m = { version = "0.7.6", features = [ "inline-asm", "critical-section-sin cortex-m-rt = "0.7.0" embedded-hal = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -embedded-io = { version = "0.6.1", features = ["defmt-03"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io = { version = "0.7.1", features = ["defmt"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } panic-probe = { version = "1.0.0", features = ["print-defmt"] } static_cell = "2" portable-atomic = { version = "1.5", features = ["critical-section"] } diff --git a/tests/nrf/Cargo.toml b/tests/nrf/Cargo.toml index 3a9b86cefe..b2c920c05e 100644 --- a/tests/nrf/Cargo.toml +++ b/tests/nrf/Cargo.toml @@ -13,7 +13,7 @@ embassy-sync = { version = "0.7.2", path = "../../embassy-sync", features = ["de embassy-executor = { version = "0.9.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt"] } embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } embassy-nrf = { version = "0.8.0", path = "../../embassy-nrf", features = ["defmt", "time-driver-rtc1", "gpiote", "unstable-pac"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +embedded-io-async = { version = "0.7.0", features = ["defmt"] } embassy-net = { version = "0.7.1", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", ] } embassy-net-esp-hosted = { version = "0.2.1", path = "../../embassy-net-esp-hosted", features = ["defmt"] } embassy-net-enc28j60 = { version = "0.2.1", path = "../../embassy-net-enc28j60", features = ["defmt"] } diff --git a/tests/rp/Cargo.toml b/tests/rp/Cargo.toml index 640e58f11d..95d2188a10 100644 --- a/tests/rp/Cargo.toml +++ b/tests/rp/Cargo.toml @@ -35,7 +35,7 @@ embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } embedded-hal-bus = { version = "0.1", features = ["async"] } panic-probe = { version = "1.0.0", features = ["print-defmt"] } -embedded-io-async = { version = "0.6.1" } +embedded-io-async = { version = "0.7.0" } embedded-storage = { version = "0.3" } static_cell = "2" portable-atomic = { version = "1.5", features = ["critical-section"] }