diff options
| author | Ulf Lilleengen <[email protected]> | 2022-09-29 11:02:43 +0200 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2022-09-29 11:27:46 +0200 |
| commit | 72c2e985bb481fbc2e138a8e98b9dbb27878f370 (patch) | |
| tree | f573324f2449b68b7b1fef579b755a67dbb406d7 /embassy-embedded-hal | |
| parent | 77ece3f903735b50f265ddd43520c50e0f28c1a1 (diff) | |
Update embedded-hal versions and explicitly pin
Diffstat (limited to 'embassy-embedded-hal')
| -rw-r--r-- | embassy-embedded-hal/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-embedded-hal/src/shared_bus/asynch/spi.rs | 6 | ||||
| -rw-r--r-- | embassy-embedded-hal/src/shared_bus/blocking/i2c.rs | 3 | ||||
| -rw-r--r-- | embassy-embedded-hal/src/shared_bus/blocking/spi.rs | 8 |
4 files changed, 10 insertions, 11 deletions
diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml index 462680720..fe8fac7c8 100644 --- a/embassy-embedded-hal/Cargo.toml +++ b/embassy-embedded-hal/Cargo.toml | |||
| @@ -18,8 +18,8 @@ nightly = ["embedded-hal-async", "embedded-storage-async"] | |||
| 18 | [dependencies] | 18 | [dependencies] |
| 19 | embassy-sync = { version = "0.1.0", path = "../embassy-sync" } | 19 | embassy-sync = { version = "0.1.0", path = "../embassy-sync" } |
| 20 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 20 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 21 | embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" } | 21 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.9" } |
| 22 | embedded-hal-async = { version = "0.1.0-alpha.1", optional = true } | 22 | embedded-hal-async = { version = "=0.1.0-alpha.2", optional = true } |
| 23 | embedded-storage = "0.3.0" | 23 | embedded-storage = "0.3.0" |
| 24 | embedded-storage-async = { version = "0.3.0", optional = true } | 24 | embedded-storage-async = { version = "0.3.0", optional = true } |
| 25 | nb = "1.0.0" | 25 | nb = "1.0.0" |
diff --git a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs index c95b59ef0..a3814d6d0 100644 --- a/embassy-embedded-hal/src/shared_bus/asynch/spi.rs +++ b/embassy-embedded-hal/src/shared_bus/asynch/spi.rs | |||
| @@ -29,7 +29,7 @@ use core::future::Future; | |||
| 29 | 29 | ||
| 30 | use embassy_sync::blocking_mutex::raw::RawMutex; | 30 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 31 | use embassy_sync::mutex::Mutex; | 31 | use embassy_sync::mutex::Mutex; |
| 32 | use embedded_hal_1::digital::blocking::OutputPin; | 32 | use embedded_hal_1::digital::OutputPin; |
| 33 | use embedded_hal_1::spi::ErrorType; | 33 | use embedded_hal_1::spi::ErrorType; |
| 34 | use embedded_hal_async::spi; | 34 | use embedded_hal_async::spi; |
| 35 | 35 | ||
| @@ -57,7 +57,7 @@ where | |||
| 57 | type Error = SpiDeviceError<BUS::Error, CS::Error>; | 57 | type Error = SpiDeviceError<BUS::Error, CS::Error>; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | impl<M, BUS, CS> spi::SpiDevice for SpiDevice<'_, M, BUS, CS> | 60 | unsafe impl<M, BUS, CS> spi::SpiDevice for SpiDevice<'_, M, BUS, CS> |
| 61 | where | 61 | where |
| 62 | M: RawMutex + 'static, | 62 | M: RawMutex + 'static, |
| 63 | BUS: spi::SpiBusFlush + 'static, | 63 | BUS: spi::SpiBusFlush + 'static, |
| @@ -122,7 +122,7 @@ where | |||
| 122 | type Error = SpiDeviceError<BUS::Error, CS::Error>; | 122 | type Error = SpiDeviceError<BUS::Error, CS::Error>; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | impl<M, BUS, CS> spi::SpiDevice for SpiDeviceWithConfig<'_, M, BUS, CS> | 125 | unsafe impl<M, BUS, CS> spi::SpiDevice for SpiDeviceWithConfig<'_, M, BUS, CS> |
| 126 | where | 126 | where |
| 127 | M: RawMutex + 'static, | 127 | M: RawMutex + 'static, |
| 128 | BUS: spi::SpiBusFlush + SetConfig + 'static, | 128 | BUS: spi::SpiBusFlush + SetConfig + 'static, |
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs index a611e2d27..892000b26 100644 --- a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs +++ b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs | |||
| @@ -20,8 +20,7 @@ use core::cell::RefCell; | |||
| 20 | 20 | ||
| 21 | use embassy_sync::blocking_mutex::raw::RawMutex; | 21 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 22 | use embassy_sync::blocking_mutex::Mutex; | 22 | use embassy_sync::blocking_mutex::Mutex; |
| 23 | use embedded_hal_1::i2c::blocking::{I2c, Operation}; | 23 | use embedded_hal_1::i2c::{ErrorType, I2c, Operation}; |
| 24 | use embedded_hal_1::i2c::ErrorType; | ||
| 25 | 24 | ||
| 26 | use crate::shared_bus::I2cDeviceError; | 25 | use crate::shared_bus::I2cDeviceError; |
| 27 | use crate::SetConfig; | 26 | use crate::SetConfig; |
diff --git a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs index 23845d887..4a08dc36e 100644 --- a/embassy-embedded-hal/src/shared_bus/blocking/spi.rs +++ b/embassy-embedded-hal/src/shared_bus/blocking/spi.rs | |||
| @@ -22,9 +22,9 @@ use core::cell::RefCell; | |||
| 22 | 22 | ||
| 23 | use embassy_sync::blocking_mutex::raw::RawMutex; | 23 | use embassy_sync::blocking_mutex::raw::RawMutex; |
| 24 | use embassy_sync::blocking_mutex::Mutex; | 24 | use embassy_sync::blocking_mutex::Mutex; |
| 25 | use embedded_hal_1::digital::blocking::OutputPin; | 25 | use embedded_hal_1::digital::OutputPin; |
| 26 | use embedded_hal_1::spi; | 26 | use embedded_hal_1::spi; |
| 27 | use embedded_hal_1::spi::blocking::SpiBusFlush; | 27 | use embedded_hal_1::spi::SpiBusFlush; |
| 28 | 28 | ||
| 29 | use crate::shared_bus::SpiDeviceError; | 29 | use crate::shared_bus::SpiDeviceError; |
| 30 | use crate::SetConfig; | 30 | use crate::SetConfig; |
| @@ -50,7 +50,7 @@ where | |||
| 50 | type Error = SpiDeviceError<BUS::Error, CS::Error>; | 50 | type Error = SpiDeviceError<BUS::Error, CS::Error>; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | impl<BUS, M, CS> embedded_hal_1::spi::blocking::SpiDevice for SpiDevice<'_, M, BUS, CS> | 53 | impl<BUS, M, CS> embedded_hal_1::spi::SpiDevice for SpiDevice<'_, M, BUS, CS> |
| 54 | where | 54 | where |
| 55 | M: RawMutex, | 55 | M: RawMutex, |
| 56 | BUS: SpiBusFlush, | 56 | BUS: SpiBusFlush, |
| @@ -146,7 +146,7 @@ where | |||
| 146 | type Error = SpiDeviceError<BUS::Error, CS::Error>; | 146 | type Error = SpiDeviceError<BUS::Error, CS::Error>; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | impl<BUS, M, CS> embedded_hal_1::spi::blocking::SpiDevice for SpiDeviceWithConfig<'_, M, BUS, CS> | 149 | impl<BUS, M, CS> embedded_hal_1::spi::SpiDevice for SpiDeviceWithConfig<'_, M, BUS, CS> |
| 150 | where | 150 | where |
| 151 | M: RawMutex, | 151 | M: RawMutex, |
| 152 | BUS: SpiBusFlush + SetConfig, | 152 | BUS: SpiBusFlush + SetConfig, |
