Update to embedded-hal-1.0.0

Author: irii

CHANGELOG.md

@@ -7,6 +7,8 @@ SSD1306 monochrome OLED display.
 
 ## [Unreleased] - ReleaseDate
 
+- Changed dependencies for embbedded-hal-1.0.0
+
 ### Added
 
 - [#203](https://github.com/jamwaffles/ssd1306/pull/203) Added `Ssd1306::release(self)` to release the contained i2c interface.

Cargo.toml

@@ -11,16 +11,16 @@ repository = "https://github.com/rust-embedded-community/ssd1306"
 version = "0.8.4"
 edition = "2018"
 exclude = [ "build.rs", "build.sh", "memory.x", "doc", "*.jpg", "*.png", "*.bmp" ]
-rust-version = "1.61"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 targets = [ "thumbv7m-none-eabi", "thumbv7em-none-eabihf" ]
 
 [dependencies]
-embedded-hal = "0.2.5"
-display-interface = "0.4.1"
-display-interface-i2c = "0.4.0"
-display-interface-spi = "0.4.1"
+embedded-hal = "1.0.0"
+display-interface = "0.5.0"
+display-interface-i2c = "0.5.0"
+display-interface-spi = "0.5.0"
 embedded-graphics-core = { version = "0.4.0", optional = true }
 
 [dev-dependencies]

examples/graphics.rs

@@ -72,7 +72,7 @@ fn main() -> ! {
         clocks,
     );
 
-    let interface = display_interface_spi::SPIInterfaceNoCS::new(spi, dc);
+    let interface = display_interface_spi::SPIInterface::new(spi, dc);
     let mut display = Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate0)
         .into_buffered_graphics_mode();
 

examples/pixelsquare.rs

@@ -68,7 +68,7 @@ fn main() -> ! {
         clocks,
     );
 
-    let interface = display_interface_spi::SPIInterfaceNoCS::new(spi, dc);
+    let interface = display_interface_spi::SPIInterface::new(spi, dc);
     let mut display = Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate0)
         .into_buffered_graphics_mode();
 

examples/rtic_brightness.rs

@@ -8,7 +8,7 @@
 
 #[rtic::app(device = stm32f1xx_hal::pac, peripherals = true, dispatchers = [EXTI0])]
 mod app {
-    use display_interface_spi::SPIInterfaceNoCS;
+    use display_interface_spi::SPIInterface;
     use embedded_graphics::{
         geometry::Point,
         image::Image,
@@ -28,7 +28,7 @@ mod app {
     use tinybmp::Bmp;
 
     type Display = Ssd1306<
-        SPIInterfaceNoCS<
+        SPIInterface<
             spi::Spi<
                 SPI1,
                 spi::Spi1NoRemap,
@@ -100,7 +100,7 @@ mod app {
             clocks,
         );
 
-        let interface = display_interface_spi::SPIInterfaceNoCS::new(spi, dc);
+        let interface = display_interface_spi::SPIInterface::new(spi, dc);
         let mut display = Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate180)
             .into_buffered_graphics_mode();
 

examples/rtic_dvd.rs

@@ -9,7 +9,7 @@
 
 #[rtic::app(device = stm32f1xx_hal::pac, peripherals = true, dispatchers = [EXTI0])]
 mod app {
-    use display_interface_spi::SPIInterfaceNoCS;
+    use display_interface_spi::SPIInterface;
     use embedded_graphics::{
         geometry::Point,
         image::Image,
@@ -29,7 +29,7 @@ mod app {
     use tinybmp::Bmp;
 
     type Display = Ssd1306<
-        SPIInterfaceNoCS<
+        SPIInterface<
             spi::Spi<
                 SPI1,
                 spi::Spi1NoRemap,
@@ -100,7 +100,7 @@ mod app {
             clocks,
         );
 
-        let interface = display_interface_spi::SPIInterfaceNoCS::new(spi, dc);
+        let interface = display_interface_spi::SPIInterface::new(spi, dc);
         let mut display = Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate180)
             .into_buffered_graphics_mode();
 

src/i2c_interface.rs

@@ -12,23 +12,23 @@ impl I2CDisplayInterface {
     // pub fn with_i2c<I>(i2c: I) -> I2CInterface<I> // alternative, but breaking change
     pub fn new<I>(i2c: I) -> I2CInterface<I>
     where
-        I: embedded_hal::blocking::i2c::Write,
+        I: embedded_hal::i2c::I2c,
     {
         Self::new_custom_address(i2c, 0x3C)
     }
 
     /// Create a new I2C interface with the alternate address 0x3D as specified in the datasheet.
     pub fn new_alternate_address<I>(i2c: I) -> I2CInterface<I>
     where
-        I: embedded_hal::blocking::i2c::Write,
+        I: embedded_hal::i2c::I2c,
     {
         Self::new_custom_address(i2c, 0x3D)
     }
 
     /// Create a new I2C interface with a custom address.
     pub fn new_custom_address<I>(i2c: I, address: u8) -> I2CInterface<I>
     where
-        I: embedded_hal::blocking::i2c::Write,
+        I: embedded_hal::i2c::I2c,
     {
         I2CInterface::new(i2c, address, 0x40)
     }

src/lib.rs

@@ -126,7 +126,7 @@ use crate::mode::BasicMode;
 use brightness::Brightness;
 use command::{AddrMode, Command, VcomhLevel};
 use display_interface::{DataFormat::U8, DisplayError, WriteOnlyDataCommand};
-use embedded_hal::{blocking::delay::DelayMs, digital::v2::OutputPin};
+use embedded_hal::{delay::DelayNs, digital::OutputPin};
 use error::Error;
 use mode::{BufferedGraphicsMode, TerminalMode};
 use rotation::DisplayRotation;
@@ -430,12 +430,12 @@ impl<DI, SIZE, MODE> Ssd1306<DI, SIZE, MODE> {
     ) -> Result<(), Error<Infallible, RST::Error>>
     where
         RST: OutputPin,
-        DELAY: DelayMs<u8>,
+        DELAY: DelayNs,
     {
         fn inner_reset<RST, DELAY>(rst: &mut RST, delay: &mut DELAY) -> Result<(), RST::Error>
         where
             RST: OutputPin,
-            DELAY: DelayMs<u8>,
+            DELAY: DelayNs,
         {
             rst.set_high()?;
             delay.delay_ms(1);

src/prelude.rs

@@ -2,7 +2,7 @@
 
 pub use display_interface::WriteOnlyDataCommand;
 pub use display_interface_i2c::I2CInterface;
-pub use display_interface_spi::{SPIInterface, SPIInterfaceNoCS};
+pub use display_interface_spi::SPIInterface;
 
 pub use super::{
     brightness::Brightness,

src/test_helpers.rs

@@ -2,41 +2,76 @@
 
 use display_interface::{DisplayError, WriteOnlyDataCommand};
 use embedded_hal::{
-    blocking::{
-        i2c,
-        spi::{self, Transfer},
-    },
-    digital::v2::OutputPin,
+    digital::{ErrorType, OutputPin},
+    i2c,
+    spi::{self, SpiBus},
 };
 
+#[derive(PartialEq, Eq, Clone, Debug, Copy)]
+pub struct Error {}
+
+impl embedded_hal::digital::Error for Error {
+    fn kind(&self) -> embedded_hal::digital::ErrorKind {
+        embedded_hal::digital::ErrorKind::Other
+    }
+}
+
+impl i2c::Error for Error {
+    fn kind(&self) -> i2c::ErrorKind {
+        i2c::ErrorKind::Other
+    }
+}
+
+impl spi::Error for Error {
+    fn kind(&self) -> spi::ErrorKind {
+        spi::ErrorKind::Other
+    }
+}
+
 #[allow(dead_code)]
 #[derive(Debug, Clone, Copy)]
 pub struct SpiStub;
 
-impl spi::Write<u8> for SpiStub {
-    type Error = ();
+impl spi::ErrorType for SpiStub {
+    type Error = Error;
+}
 
-    fn write(&mut self, _buf: &[u8]) -> Result<(), ()> {
+impl SpiBus<u8> for SpiStub {
+    fn read(&mut self, _words: &mut [u8]) -> Result<(), Self::Error> {
+        todo!()
+    }
+
+    fn write(&mut self, _words: &[u8]) -> Result<(), Self::Error> {
+        Ok(())
+    }
+
+    fn transfer(&mut self, _read: &mut [u8], _write: &[u8]) -> Result<(), Self::Error> {
         Ok(())
     }
-}
 
-impl Transfer<u8> for SpiStub {
-    type Error = ();
+    fn transfer_in_place(&mut self, _words: &mut [u8]) -> Result<(), Self::Error> {
+        todo!()
+    }
 
-    fn transfer<'a>(&mut self, buf: &'a mut [u8]) -> Result<&'a [u8], ()> {
-        Ok(buf)
+    fn flush(&mut self) -> Result<(), Self::Error> {
+        todo!()
     }
 }
 
 #[allow(dead_code)]
 #[derive(Debug, Clone, Copy)]
 pub struct I2cStub;
 
-impl i2c::Write for I2cStub {
-    type Error = ();
+impl i2c::ErrorType for I2cStub {
+    type Error = Error;
+}
 
-    fn write(&mut self, _addr: u8, _buf: &[u8]) -> Result<(), ()> {
+impl i2c::I2c for I2cStub {
+    fn transaction(
+        &mut self,
+        _address: u8,
+        _operations: &mut [i2c::Operation<'_>],
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }
@@ -45,14 +80,16 @@ impl i2c::Write for I2cStub {
 #[derive(Debug, Clone, Copy)]
 pub struct PinStub;
 
-impl OutputPin for PinStub {
-    type Error = ();
+impl ErrorType for PinStub {
+    type Error = Error;
+}
 
-    fn set_high(&mut self) -> Result<(), ()> {
+impl OutputPin for PinStub {
+    fn set_low(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
 
-    fn set_low(&mut self) -> Result<(), ()> {
+    fn set_high(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
 }