fix spi for use with embedded-hal v1.0.0-alpha.8

Author: almindor

spi/Cargo.toml

@@ -18,6 +18,6 @@ edition = "2018"
 all-features = true
 
 [dependencies]
-embedded-hal = "1.0.0-alpha.7"
+embedded-hal = "1.0.0-alpha.8"
 display-interface = "0.4.1"
 byte-slice-cast = { version = "0.3.5", default-features = false }

spi/src/lib.rs

@@ -2,14 +2,20 @@
 
 //! Generic SPI interface for display drivers
 
-use embedded_hal::digital::blocking::OutputPin;
-use embedded_hal::spi::blocking::Write;
+use embedded_hal::{
+    digital::blocking::OutputPin,
+    spi::blocking::{SpiBusWrite, SpiDevice},
+};
 
 use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand};
 
 type Result = core::result::Result<(), DisplayError>;
 
-fn send_u8<SPI: Write<u8>>(spi: &mut SPI, words: DataFormat<'_>) -> Result {
+fn send_u8<SPI>(spi: &mut SPI, words: DataFormat<'_>) -> Result
+where
+    SPI: SpiDevice,
+    SPI::Bus: SpiBusWrite,
+{
     match words {
         DataFormat::U8(slice) => spi.write(slice).map_err(|_| DisplayError::BusWriteError),
         DataFormat::U16(slice) => {
@@ -115,7 +121,8 @@ pub struct SPIInterface<SPI, DC, CS> {
 
 impl<SPI, DC, CS> SPIInterface<SPI, DC, CS>
 where
-    SPI: Write<u8>,
+    SPI: SpiDevice,
+    SPI::Bus: SpiBusWrite,
     DC: OutputPin,
     CS: OutputPin,
 {
@@ -149,7 +156,8 @@ where
 
 impl<SPI, DC, CS> WriteOnlyDataCommand for SPIInterface<SPI, DC, CS>
 where
-    SPI: Write<u8>,
+    SPI: SpiDevice,
+    SPI::Bus: SpiBusWrite,
     DC: OutputPin,
     CS: OutputPin,
 {
@@ -172,7 +180,8 @@ pub struct SPIInterfaceNoCS<SPI, DC> {
 
 impl<SPI, DC> SPIInterfaceNoCS<SPI, DC>
 where
-    SPI: Write<u8>,
+    SPI: SpiDevice,
+    SPI::Bus: SpiBusWrite,
     DC: OutputPin,
 {
     /// Create new SPI interface for communciation with a display driver
@@ -189,7 +198,8 @@ where
 
 impl<SPI, DC> WriteOnlyDataCommand for SPIInterfaceNoCS<SPI, DC>
 where
-    SPI: Write<u8>,
+    SPI: SpiDevice,
+    SPI::Bus: SpiBusWrite,
     DC: OutputPin,
 {
     fn send_commands(&mut self, cmds: DataFormat<'_>) -> Result {