Use display-interface for display communication take 2 (#116)

* Use display-interface for display communication take 2

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

* Update Cargo.toml

Co-Authored-By: James Waples <[email protected]>

* Update src/builder.rs

Co-Authored-By: James Waples <[email protected]>

* Update src/builder.rs

Co-Authored-By: James Waples <[email protected]>

* Fix link

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

Co-authored-by: James Waples <[email protected]>

Author: therealprof

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 ### Changed
 
+- **(breaking)** [#116](https://github.com/jamwaffles/ssd1306/pull/116) Replace custom I2C and SPI interfaces by generic [`display-interface`](https://crates.io/crates/display-interface)
 - **(breaking)** [#113](https://github.com/jamwaffles/ssd1306/pull/113) Removed public `send_bounded_data` from DisplayInterface and implementations
 
 ## [0.3.1] - 2020-03-21

Cargo.toml

@@ -19,6 +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"
 
 [dependencies.embedded-graphics]
 optional = true

README.md

@@ -31,7 +31,7 @@ use embedded_graphics::{
     prelude::*,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -70,7 +70,8 @@ fn main() -> ! {
         1000,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_i2c(i2c).into();
+    let interface = I2CDIBuilder::new().init(i2c);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
 
     disp.init().unwrap();
 

examples/bmp_i2c.rs

@@ -28,7 +28,7 @@ use embedded_graphics::{
     prelude::*,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -68,8 +68,8 @@ fn main() -> ! {
         1000,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_i2c(i2c).into();
-
+    let interface = I2CDIBuilder::new().init(i2c);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
     disp.init().unwrap();
 
     let bmp =

examples/graphics.rs

@@ -74,7 +74,8 @@ fn main() -> ! {
         &mut rcc.apb2,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_spi(spi, dc).into();
+    let interface = display_interface_spi::SPIInterfaceNoCS::new(spi, dc);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
 
     disp.reset(&mut rst, &mut delay).unwrap();
     disp.init().unwrap();

examples/graphics_i2c.rs

@@ -25,7 +25,7 @@ use embedded_graphics::{
     style::PrimitiveStyleBuilder,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -64,8 +64,8 @@ fn main() -> ! {
         1000,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_i2c(i2c).into();
-
+    let interface = I2CDIBuilder::new().init(i2c);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
     disp.init().unwrap();
 
     let yoffset = 20;

examples/graphics_i2c_128x32.rs

@@ -25,7 +25,7 @@ use embedded_graphics::{
     style::PrimitiveStyleBuilder,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -64,9 +64,10 @@ fn main() -> ! {
         1000,
     );
 
+    let interface = I2CDIBuilder::new().init(i2c);
     let mut disp: GraphicsMode<_> = Builder::new()
         .size(DisplaySize::Display128x32)
-        .connect_i2c(i2c)
+        .connect(interface)
         .into();
     disp.init().unwrap();
 

examples/graphics_i2c_72x40.rs

@@ -25,7 +25,7 @@ use embedded_graphics::{
     style::PrimitiveStyleBuilder,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -64,11 +64,11 @@ fn main() -> ! {
         1000,
     );
 
+    let interface = I2CDIBuilder::new().init(i2c);
     let mut disp: GraphicsMode<_> = Builder::new()
         .size(DisplaySize::Display72x40)
-        .connect_i2c(i2c)
+        .connect(interface)
         .into();
-
     disp.init().unwrap();
 
     let size = 10;

examples/image_i2c.rs

@@ -30,7 +30,7 @@ use embedded_graphics::{
     prelude::*,
 };
 use panic_halt as _;
-use ssd1306::{prelude::*, Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -69,8 +69,8 @@ fn main() -> ! {
         1000,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_i2c(i2c).into();
-
+    let interface = I2CDIBuilder::new().init(i2c);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
     disp.init().unwrap();
 
     let raw: ImageRaw<BinaryColor> = ImageRaw::new(include_bytes!("./rust.raw"), 64, 64);

examples/noise_i2c.rs

@@ -22,7 +22,7 @@
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use panic_halt as _;
 use rand::prelude::*;
-use ssd1306::{mode::displaymode::DisplayModeTrait, prelude::*, Builder};
+use ssd1306::{mode::displaymode::DisplayModeTrait, prelude::*, Builder, I2CDIBuilder};
 use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
@@ -61,8 +61,8 @@ fn main() -> ! {
         1000,
     );
 
-    let mut disp: GraphicsMode<_> = Builder::new().connect_i2c(i2c).into();
-
+    let interface = I2CDIBuilder::new().init(i2c);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
     disp.init().unwrap();
 
     let mut props = disp.release();