Merge pull request #668 from rursprung/embedded-hal-1.0.0-alpha.11

update to `embedded-hal=1.0.0.alpha-11`

Author: burrbull

CHANGELOG.md

@@ -11,15 +11,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
  - `rcc::Enable`, `rcc::LPEnable` traits, timclk in `Clocks` instead of prescalers [#665]
  - move gpio, dma impls, adc pins in subdir, remove unused `From` impls [#658] [#664]
- - Bump `embedded-hal` to `1.0.0-alpha.10`. See [their changelog][embedded-hal-1.0.0-alpha.10] for further details. Note that this included breaking changes to the previous alpha APIs. [#663]
+ - Bump `embedded-hal` to `1.0.0-alpha.11`. See [their changelog][embedded-hal-1.0.0-alpha.11] for further details. Note that this included breaking changes to the previous alpha APIs. [#663],[#668]
  - Fix race condition in sending start condition in I2C. [#662]
 
 [#658]: https://github.com/stm32-rs/stm32f4xx-hal/pull/658
 [#662]: https://github.com/stm32-rs/stm32f4xx-hal/pull/662
 [#663]: https://github.com/stm32-rs/stm32f4xx-hal/pull/663
 [#664]: https://github.com/stm32-rs/stm32f4xx-hal/pull/664
 [#665]: https://github.com/stm32-rs/stm32f4xx-hal/pull/665
-[embedded-hal-1.0.0-alpha.10]: https://github.com/rust-embedded/embedded-hal/blob/v1.0.0-alpha.10/embedded-hal/CHANGELOG.md
+[#668]: https://github.com/stm32-rs/stm32f4xx-hal/pull/668
+[embedded-hal-1.0.0-alpha.11]: https://github.com/rust-embedded/embedded-hal/blob/v1.0.0-alpha.11/embedded-hal/CHANGELOG.md
 
 ## [v0.16.2] - 2023-06-27
 

Cargo.toml

@@ -40,7 +40,7 @@ embedded-dma = "0.2.0"
 bare-metal = { version = "1" }
 void = { default-features = false, version = "1.0.2" }
 embedded-hal = { features = ["unproven"], version = "0.2.7" }
-embedded-hal-nb = "1.0.0-alpha.2"
+embedded-hal-nb = "1.0.0-alpha.3"
 display-interface = { version = "0.4.1", optional = true }
 fugit = "0.3.6"
 fugit-timer = "0.1.3"
@@ -54,7 +54,7 @@ version = "0.3.14"
 default-features = false
 
 [dependencies.embedded-hal-one]
-version = "=1.0.0-alpha.10"
+version = "=1.0.0-alpha.11"
 package = "embedded-hal"
 
 [dependencies.stm32_i2s_v12x]

src/spi/hal_1.rs

@@ -63,7 +63,7 @@ mod nb {
 
 mod blocking {
     use super::super::{FrameSize, Instance, Spi};
-    use embedded_hal_one::spi::{SpiBus, SpiBusFlush, SpiBusRead, SpiBusWrite};
+    use embedded_hal_one::spi::SpiBus;
 
     impl<SPI, const BIDI: bool, W: FrameSize + 'static> SpiBus<W> for Spi<SPI, BIDI, W>
     where
@@ -76,21 +76,16 @@ mod blocking {
         fn transfer(&mut self, buff: &mut [W], data: &[W]) -> Result<(), Self::Error> {
             self.transfer(buff, data)
         }
-    }
 
-    impl<SPI, const BIDI: bool, W> SpiBusFlush for Spi<SPI, BIDI, W>
-    where
-        SPI: Instance,
-    {
-        fn flush(&mut self) -> Result<(), Self::Error> {
+        fn read(&mut self, words: &mut [W]) -> Result<(), Self::Error> {
+            for word in words {
+                nb::block!(self.write_nonblocking(W::default()))?;
+                *word = nb::block!(self.read_nonblocking())?;
+            }
+
             Ok(())
         }
-    }
 
-    impl<SPI, const BIDI: bool, W: FrameSize + 'static> SpiBusWrite<W> for Spi<SPI, BIDI, W>
-    where
-        SPI: Instance,
-    {
         fn write(&mut self, words: &[W]) -> Result<(), Self::Error> {
             for word in words {
                 nb::block!(self.write_nonblocking(*word))?;
@@ -101,18 +96,8 @@ mod blocking {
 
             Ok(())
         }
-    }
-
-    impl<SPI, const BIDI: bool, W: FrameSize + 'static> SpiBusRead<W> for Spi<SPI, BIDI, W>
-    where
-        SPI: Instance,
-    {
-        fn read(&mut self, words: &mut [W]) -> Result<(), Self::Error> {
-            for word in words {
-                nb::block!(self.write_nonblocking(W::default()))?;
-                *word = nb::block!(self.read_nonblocking())?;
-            }
 
+        fn flush(&mut self) -> Result<(), Self::Error> {
             Ok(())
         }
     }