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-stm32/src | |
| parent | 77ece3f903735b50f265ddd43520c50e0f28c1a1 (diff) | |
Update embedded-hal versions and explicitly pin
Diffstat (limited to 'embassy-stm32/src')
| -rw-r--r-- | embassy-stm32/src/exti.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/gpio.rs | 3 | ||||
| -rw-r--r-- | embassy-stm32/src/i2c/v1.rs | 6 | ||||
| -rw-r--r-- | embassy-stm32/src/i2c/v2.rs | 6 | ||||
| -rw-r--r-- | embassy-stm32/src/spi/mod.rs | 8 |
5 files changed, 12 insertions, 13 deletions
diff --git a/embassy-stm32/src/exti.rs b/embassy-stm32/src/exti.rs index 07c96ead0..dca991859 100644 --- a/embassy-stm32/src/exti.rs +++ b/embassy-stm32/src/exti.rs | |||
| @@ -155,7 +155,7 @@ mod eh1 { | |||
| 155 | type Error = Infallible; | 155 | type Error = Infallible; |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | impl<'d, T: GpioPin> embedded_hal_1::digital::blocking::InputPin for ExtiInput<'d, T> { | 158 | impl<'d, T: GpioPin> embedded_hal_1::digital::InputPin for ExtiInput<'d, T> { |
| 159 | fn is_high(&self) -> Result<bool, Self::Error> { | 159 | fn is_high(&self) -> Result<bool, Self::Error> { |
| 160 | Ok(self.is_high()) | 160 | Ok(self.is_high()) |
| 161 | } | 161 | } |
diff --git a/embassy-stm32/src/gpio.rs b/embassy-stm32/src/gpio.rs index d794e3989..5e3346754 100644 --- a/embassy-stm32/src/gpio.rs +++ b/embassy-stm32/src/gpio.rs | |||
| @@ -848,8 +848,7 @@ mod eh02 { | |||
| 848 | 848 | ||
| 849 | #[cfg(feature = "unstable-traits")] | 849 | #[cfg(feature = "unstable-traits")] |
| 850 | mod eh1 { | 850 | mod eh1 { |
| 851 | use embedded_hal_1::digital::blocking::{InputPin, OutputPin, StatefulOutputPin, ToggleableOutputPin}; | 851 | use embedded_hal_1::digital::{ErrorType, InputPin, OutputPin, StatefulOutputPin, ToggleableOutputPin}; |
| 852 | use embedded_hal_1::digital::ErrorType; | ||
| 853 | 852 | ||
| 854 | use super::*; | 853 | use super::*; |
| 855 | 854 | ||
diff --git a/embassy-stm32/src/i2c/v1.rs b/embassy-stm32/src/i2c/v1.rs index 9dc75789a..f39a37df6 100644 --- a/embassy-stm32/src/i2c/v1.rs +++ b/embassy-stm32/src/i2c/v1.rs | |||
| @@ -334,7 +334,7 @@ mod eh1 { | |||
| 334 | type Error = Error; | 334 | type Error = Error; |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | impl<'d, T: Instance> embedded_hal_1::i2c::blocking::I2c for I2c<'d, T> { | 337 | impl<'d, T: Instance> embedded_hal_1::i2c::I2c for I2c<'d, T> { |
| 338 | fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> { | 338 | fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> { |
| 339 | self.blocking_read(address, buffer) | 339 | self.blocking_read(address, buffer) |
| 340 | } | 340 | } |
| @@ -364,14 +364,14 @@ mod eh1 { | |||
| 364 | fn transaction<'a>( | 364 | fn transaction<'a>( |
| 365 | &mut self, | 365 | &mut self, |
| 366 | _address: u8, | 366 | _address: u8, |
| 367 | _operations: &mut [embedded_hal_1::i2c::blocking::Operation<'a>], | 367 | _operations: &mut [embedded_hal_1::i2c::Operation<'a>], |
| 368 | ) -> Result<(), Self::Error> { | 368 | ) -> Result<(), Self::Error> { |
| 369 | todo!(); | 369 | todo!(); |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | fn transaction_iter<'a, O>(&mut self, _address: u8, _operations: O) -> Result<(), Self::Error> | 372 | fn transaction_iter<'a, O>(&mut self, _address: u8, _operations: O) -> Result<(), Self::Error> |
| 373 | where | 373 | where |
| 374 | O: IntoIterator<Item = embedded_hal_1::i2c::blocking::Operation<'a>>, | 374 | O: IntoIterator<Item = embedded_hal_1::i2c::Operation<'a>>, |
| 375 | { | 375 | { |
| 376 | todo!(); | 376 | todo!(); |
| 377 | } | 377 | } |
diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs index b7c89931c..89b52da98 100644 --- a/embassy-stm32/src/i2c/v2.rs +++ b/embassy-stm32/src/i2c/v2.rs | |||
| @@ -883,7 +883,7 @@ mod eh1 { | |||
| 883 | type Error = Error; | 883 | type Error = Error; |
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | impl<'d, T: Instance> embedded_hal_1::i2c::blocking::I2c for I2c<'d, T, NoDma, NoDma> { | 886 | impl<'d, T: Instance> embedded_hal_1::i2c::I2c for I2c<'d, T, NoDma, NoDma> { |
| 887 | fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> { | 887 | fn read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> { |
| 888 | self.blocking_read(address, buffer) | 888 | self.blocking_read(address, buffer) |
| 889 | } | 889 | } |
| @@ -913,14 +913,14 @@ mod eh1 { | |||
| 913 | fn transaction<'a>( | 913 | fn transaction<'a>( |
| 914 | &mut self, | 914 | &mut self, |
| 915 | _address: u8, | 915 | _address: u8, |
| 916 | _operations: &mut [embedded_hal_1::i2c::blocking::Operation<'a>], | 916 | _operations: &mut [embedded_hal_1::i2c::Operation<'a>], |
| 917 | ) -> Result<(), Self::Error> { | 917 | ) -> Result<(), Self::Error> { |
| 918 | todo!(); | 918 | todo!(); |
| 919 | } | 919 | } |
| 920 | 920 | ||
| 921 | fn transaction_iter<'a, O>(&mut self, _address: u8, _operations: O) -> Result<(), Self::Error> | 921 | fn transaction_iter<'a, O>(&mut self, _address: u8, _operations: O) -> Result<(), Self::Error> |
| 922 | where | 922 | where |
| 923 | O: IntoIterator<Item = embedded_hal_1::i2c::blocking::Operation<'a>>, | 923 | O: IntoIterator<Item = embedded_hal_1::i2c::Operation<'a>>, |
| 924 | { | 924 | { |
| 925 | todo!(); | 925 | todo!(); |
| 926 | } | 926 | } |
diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 556d12305..396427782 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs | |||
| @@ -843,25 +843,25 @@ mod eh1 { | |||
| 843 | type Error = Error; | 843 | type Error = Error; |
| 844 | } | 844 | } |
| 845 | 845 | ||
| 846 | impl<'d, T: Instance, Tx, Rx> embedded_hal_1::spi::blocking::SpiBusFlush for Spi<'d, T, Tx, Rx> { | 846 | impl<'d, T: Instance, Tx, Rx> embedded_hal_1::spi::SpiBusFlush for Spi<'d, T, Tx, Rx> { |
| 847 | fn flush(&mut self) -> Result<(), Self::Error> { | 847 | fn flush(&mut self) -> Result<(), Self::Error> { |
| 848 | Ok(()) | 848 | Ok(()) |
| 849 | } | 849 | } |
| 850 | } | 850 | } |
| 851 | 851 | ||
| 852 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::blocking::SpiBusRead<W> for Spi<'d, T, NoDma, NoDma> { | 852 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::SpiBusRead<W> for Spi<'d, T, NoDma, NoDma> { |
| 853 | fn read(&mut self, words: &mut [W]) -> Result<(), Self::Error> { | 853 | fn read(&mut self, words: &mut [W]) -> Result<(), Self::Error> { |
| 854 | self.blocking_read(words) | 854 | self.blocking_read(words) |
| 855 | } | 855 | } |
| 856 | } | 856 | } |
| 857 | 857 | ||
| 858 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::blocking::SpiBusWrite<W> for Spi<'d, T, NoDma, NoDma> { | 858 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::SpiBusWrite<W> for Spi<'d, T, NoDma, NoDma> { |
| 859 | fn write(&mut self, words: &[W]) -> Result<(), Self::Error> { | 859 | fn write(&mut self, words: &[W]) -> Result<(), Self::Error> { |
| 860 | self.blocking_write(words) | 860 | self.blocking_write(words) |
| 861 | } | 861 | } |
| 862 | } | 862 | } |
| 863 | 863 | ||
| 864 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::blocking::SpiBus<W> for Spi<'d, T, NoDma, NoDma> { | 864 | impl<'d, T: Instance, W: Word> embedded_hal_1::spi::SpiBus<W> for Spi<'d, T, NoDma, NoDma> { |
| 865 | fn transfer(&mut self, read: &mut [W], write: &[W]) -> Result<(), Self::Error> { | 865 | fn transfer(&mut self, read: &mut [W], write: &[W]) -> Result<(), Self::Error> { |
| 866 | self.blocking_transfer(read, write) | 866 | self.blocking_transfer(read, write) |
| 867 | } | 867 | } |
