diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-08-16 00:40:56 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-16 00:40:56 +0200 |
| commit | f26dd54f6378be87a71f0c9f351b56851df96014 (patch) | |
| tree | 6fbaea24c44d4fbbe01b08a0d87b9d8e49a4ad5a /embassy-embedded-hal | |
| parent | ffe96889525105ac37cb74add67ac73f148726f6 (diff) | |
Update embedded-hal to 1.0.0-rc.1 (#1783)
Diffstat (limited to 'embassy-embedded-hal')
| -rw-r--r-- | embassy-embedded-hal/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-embedded-hal/src/adapter/blocking_async.rs | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml index bba3d48be..fd921d277 100644 --- a/embassy-embedded-hal/Cargo.toml +++ b/embassy-embedded-hal/Cargo.toml | |||
| @@ -25,8 +25,8 @@ embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } | |||
| 25 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | 25 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ |
| 26 | "unproven", | 26 | "unproven", |
| 27 | ] } | 27 | ] } |
| 28 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 28 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 29 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true } | 29 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true } |
| 30 | embedded-storage = "0.3.0" | 30 | embedded-storage = "0.3.0" |
| 31 | embedded-storage-async = { version = "0.4.0", optional = true } | 31 | embedded-storage-async = { version = "0.4.0", optional = true } |
| 32 | nb = "1.0.0" | 32 | nb = "1.0.0" |
diff --git a/embassy-embedded-hal/src/adapter/blocking_async.rs b/embassy-embedded-hal/src/adapter/blocking_async.rs index 98ae2b02c..ae0d0a7f9 100644 --- a/embassy-embedded-hal/src/adapter/blocking_async.rs +++ b/embassy-embedded-hal/src/adapter/blocking_async.rs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | use embedded_hal_02::{blocking, serial}; | 1 | use embedded_hal_02::blocking; |
| 2 | 2 | ||
| 3 | /// Wrapper that implements async traits using blocking implementations. | 3 | /// Wrapper that implements async traits using blocking implementations. |
| 4 | /// | 4 | /// |
| @@ -103,15 +103,6 @@ where | |||
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | // Uart implementatinos | ||
| 107 | impl<T, E> embedded_hal_1::serial::ErrorType for BlockingAsync<T> | ||
| 108 | where | ||
| 109 | T: serial::Read<u8, Error = E>, | ||
| 110 | E: embedded_hal_1::serial::Error + 'static, | ||
| 111 | { | ||
| 112 | type Error = E; | ||
| 113 | } | ||
| 114 | |||
| 115 | /// NOR flash wrapper | 106 | /// NOR flash wrapper |
| 116 | use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; | 107 | use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; |
| 117 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; | 108 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; |
