Use new display-interface v0.3 (#117)

Signed-off-by: Daniel Egger <[email protected]>

Author: therealprof

Cargo.toml

@@ -19,9 +19,9 @@ targets = [ "thumbv7m-none-eabi", "thumbv7em-none-eabihf" ]
 
 [dependencies]
 embedded-hal = "0.2.3"
-display-interface = "0.2"
-display-interface-i2c = "0.2"
-display-interface-spi = "0.2"
+display-interface = "0.3"
+display-interface-i2c = "0.3"
+display-interface-spi = "0.3"
 
 [dependencies.embedded-graphics]
 optional = true

examples/rtfm_dvd.rs

@@ -37,7 +37,6 @@ type Display = ssd1306::mode::graphics::GraphicsMode<
             ),
         >,
         gpio::gpiob::PB1<gpio::Output<gpio::PushPull>>,
-        u8,
     >,
 >;
 

src/builder.rs

@@ -105,7 +105,7 @@ impl Builder {
     /// This method consumes the builder and must come last in the method call chain
     pub fn connect<I>(self, interface: I) -> DisplayMode<RawMode<I>>
     where
-        I: WriteOnlyDataCommand<u8>,
+        I: WriteOnlyDataCommand,
     {
         let properties = DisplayProperties::new(interface, self.display_size, self.rotation);
         DisplayMode::<RawMode<I>>::new(properties)
@@ -141,7 +141,7 @@ impl I2CDIBuilder {
     /// Finish the builder and return an initialised display interface for further use
     ///
     /// This method consumes the builder and must come last in the method call chain
-    pub fn init<I: hal::blocking::i2c::Write>(self, i2c: I) -> impl WriteOnlyDataCommand<u8> {
+    pub fn init<I: hal::blocking::i2c::Write>(self, i2c: I) -> impl WriteOnlyDataCommand {
         display_interface_i2c::I2CInterface::new(i2c, self.i2c_addr, 0x40)
     }
 }

src/command.rs

@@ -1,6 +1,6 @@
 // Shamefully taken from https://github.com/EdgewaterDevelopment/rust-ssd1306
 
-use display_interface::{DisplayError, WriteOnlyDataCommand};
+use display_interface::{DataFormat::U8, DisplayError, WriteOnlyDataCommand};
 
 /// SSD1306 Commands
 
@@ -90,7 +90,7 @@ impl Command {
     /// Send command to SSD1306
     pub fn send<DI>(self, iface: &mut DI) -> Result<(), DisplayError>
     where
-        DI: WriteOnlyDataCommand<u8>,
+        DI: WriteOnlyDataCommand,
     {
         // Transform command into a fixed size array of 7 u8 and the real length for sending
         let (data, len) = match self {
@@ -161,7 +161,7 @@ impl Command {
         };
 
         // Send command over the interface
-        iface.send_commands(&data[0..len])
+        iface.send_commands(U8(&data[0..len]))
     }
 }
 

src/mode/displaymode.rs

@@ -20,7 +20,7 @@ impl<MODE> DisplayMode<MODE> {
     /// Setup display to run in requested mode
     pub fn new<DI>(properties: DisplayProperties<DI>) -> Self
     where
-        DI: WriteOnlyDataCommand<u8>,
+        DI: WriteOnlyDataCommand,
         MODE: DisplayModeTrait<DI>,
     {
         DisplayMode(MODE::new(properties))
@@ -30,7 +30,7 @@ impl<MODE> DisplayMode<MODE> {
     // TODO: Figure out how to stay as generic DisplayMode but act as particular mode
     pub fn into<DI, NMODE: DisplayModeTrait<DI>>(self) -> NMODE
     where
-        DI: WriteOnlyDataCommand<u8>,
+        DI: WriteOnlyDataCommand,
         MODE: DisplayModeTrait<DI>,
     {
         let properties = self.0.release();

src/mode/graphics.rs

@@ -67,7 +67,7 @@ use crate::{
 /// Graphics mode handler
 pub struct GraphicsMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     properties: DisplayProperties<DI>,
     buffer: [u8; 1024],
@@ -79,7 +79,7 @@ where
 
 impl<DI> DisplayModeTrait<DI> for GraphicsMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Create new GraphicsMode instance
     fn new(properties: DisplayProperties<DI>) -> Self {
@@ -101,7 +101,7 @@ where
 
 impl<DI> GraphicsMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Clear the display buffer. You need to call `disp.flush()` for any effect on the screen
     pub fn clear(&mut self) {
@@ -269,7 +269,7 @@ use embedded_graphics::{
 #[cfg(feature = "graphics")]
 impl<DI> DrawTarget<BinaryColor> for GraphicsMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     type Error = DisplayError;
 

src/mode/raw.rs

@@ -10,14 +10,14 @@ use display_interface::WriteOnlyDataCommand;
 /// Raw display mode
 pub struct RawMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     properties: DisplayProperties<DI>,
 }
 
 impl<DI> DisplayModeTrait<DI> for RawMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Create new RawMode instance
     fn new(properties: DisplayProperties<DI>) -> Self {
@@ -30,7 +30,7 @@ where
     }
 }
 
-impl<DI: WriteOnlyDataCommand<u8>> RawMode<DI> {
+impl<DI: WriteOnlyDataCommand> RawMode<DI> {
     /// Create a new raw display mode
     pub fn new(properties: DisplayProperties<DI>) -> Self {
         RawMode { properties }

src/mode/terminal.rs

@@ -142,7 +142,7 @@ pub struct TerminalMode<DI> {
 
 impl<DI> DisplayModeTrait<DI> for TerminalMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Create new TerminalMode instance
     fn new(properties: DisplayProperties<DI>) -> Self {
@@ -160,7 +160,7 @@ where
 
 impl<DI> TerminalMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Clear the display and reset the cursor to the top left corner
     pub fn clear(&mut self) -> Result<(), TerminalModeError> {
@@ -429,7 +429,7 @@ where
 
 impl<DI> fmt::Write for TerminalMode<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     fn write_str(&mut self, s: &str) -> Result<(), fmt::Error> {
         s.chars().map(move |c| self.print_char(c)).last();

src/properties.rs

@@ -5,7 +5,7 @@ use crate::{
     displayrotation::DisplayRotation,
     displaysize::DisplaySize,
 };
-use display_interface::{DisplayError, WriteOnlyDataCommand};
+use display_interface::{DataFormat::U8, DisplayError, WriteOnlyDataCommand};
 
 /// Display properties struct
 pub struct DisplayProperties<DI> {
@@ -18,7 +18,7 @@ pub struct DisplayProperties<DI> {
 
 impl<DI> DisplayProperties<DI>
 where
-    DI: WriteOnlyDataCommand<u8>,
+    DI: WriteOnlyDataCommand,
 {
     /// Create new DisplayProperties instance
     pub fn new(
@@ -136,7 +136,7 @@ where
     /// and advance the position accordingly. Cf. `set_draw_area` to modify the area affected by
     /// this method in horizontal / vertical mode.
     pub fn draw(&mut self, buffer: &[u8]) -> Result<(), DisplayError> {
-        self.iface.send_data(&buffer)
+        self.iface.send_data(U8(&buffer))
     }
 
     /// Send the data to the display for drawing at the current position in the framebuffer
@@ -167,7 +167,7 @@ where
             .skip(starting_page)
             .take(num_pages)
             .map(|s| &s[page_lower..page_upper])
-            .try_for_each(|c| self.iface.send_data(&c))
+            .try_for_each(|c| self.iface.send_data(U8(&c)))
     }
 
     /// Get the configured display size

src/test_helpers.rs

@@ -61,11 +61,14 @@ impl OutputPin for PinStub {
 #[derive(Debug, Clone, Copy)]
 pub struct StubInterface;
 
-impl WriteOnlyDataCommand<u8> for StubInterface {
-    fn send_commands(&mut self, _cmd: &[u8]) -> Result<(), DisplayError> {
+impl WriteOnlyDataCommand for StubInterface {
+    fn send_commands(
+        &mut self,
+        _cmd: display_interface::DataFormat<'_>,
+    ) -> Result<(), DisplayError> {
         Ok(())
     }
-    fn send_data(&mut self, _buf: &[u8]) -> Result<(), DisplayError> {
+    fn send_data(&mut self, _buf: display_interface::DataFormat<'_>) -> Result<(), DisplayError> {
         Ok(())
     }
 }