diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-12-19 12:41:25 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-19 12:41:25 +0100 |
| commit | 14efaf71d76ad0af569522ee0c4082d473fdede7 (patch) | |
| tree | ee9f4352e70815e97e424bb534c1c096242b9af0 /embassy-rp | |
| parent | 3214021ed5ae17b96ac006c0f460e222502e411d (diff) | |
| parent | 62ed44f99af9e33d689c8308149f8f992176895f (diff) | |
Merge pull request #4745 from embassy-rs/io07
Update to embedded-io 0.7
Diffstat (limited to 'embassy-rp')
| -rw-r--r-- | embassy-rp/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-rp/src/pio_programs/uart.rs | 4 | ||||
| -rw-r--r-- | embassy-rp/src/uart/mod.rs | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index 8e4bb927f..585acc064 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml | |||
| @@ -167,8 +167,8 @@ cortex-m-rt = ">=0.6.15,<0.8" | |||
| 167 | cortex-m = "0.7.6" | 167 | cortex-m = "0.7.6" |
| 168 | critical-section = "1.2.0" | 168 | critical-section = "1.2.0" |
| 169 | chrono = { version = "0.4", default-features = false, optional = true } | 169 | chrono = { version = "0.4", default-features = false, optional = true } |
| 170 | embedded-io = { version = "0.6.1" } | 170 | embedded-io = { version = "0.7.1" } |
| 171 | embedded-io-async = { version = "0.6.1" } | 171 | embedded-io-async = { version = "0.7.0" } |
| 172 | embedded-storage = { version = "0.3" } | 172 | embedded-storage = { version = "0.3" } |
| 173 | embedded-storage-async = { version = "0.4.1" } | 173 | embedded-storage-async = { version = "0.4.1" } |
| 174 | fixed = "1.28.0" | 174 | fixed = "1.28.0" |
diff --git a/embassy-rp/src/pio_programs/uart.rs b/embassy-rp/src/pio_programs/uart.rs index d59596dd1..a16d89a75 100644 --- a/embassy-rp/src/pio_programs/uart.rs +++ b/embassy-rp/src/pio_programs/uart.rs | |||
| @@ -90,6 +90,10 @@ impl<PIO: Instance, const SM: usize> Write for PioUartTx<'_, PIO, SM> { | |||
| 90 | } | 90 | } |
| 91 | Ok(buf.len()) | 91 | Ok(buf.len()) |
| 92 | } | 92 | } |
| 93 | |||
| 94 | async fn flush(&mut self) -> Result<(), Infallible> { | ||
| 95 | Ok(()) | ||
| 96 | } | ||
| 93 | } | 97 | } |
| 94 | 98 | ||
| 95 | /// This struct represents a Uart Rx program loaded into pio instruction memory. | 99 | /// 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 b7b569dd5..f53b2f88e 100644 --- a/embassy-rp/src/uart/mod.rs +++ b/embassy-rp/src/uart/mod.rs | |||
| @@ -118,6 +118,14 @@ pub enum Error { | |||
| 118 | Framing, | 118 | Framing, |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | impl core::fmt::Display for Error { | ||
| 122 | fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { | ||
| 123 | core::fmt::Debug::fmt(self, f) | ||
| 124 | } | ||
| 125 | } | ||
| 126 | |||
| 127 | impl core::error::Error for Error {} | ||
| 128 | |||
| 121 | /// Read To Break error | 129 | /// Read To Break error |
| 122 | #[derive(Debug, Eq, PartialEq, Copy, Clone)] | 130 | #[derive(Debug, Eq, PartialEq, Copy, Clone)] |
| 123 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | 131 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] |
