Merge #217

217: Bump ssd1306 dev dependency to 0.4 and updated examples r=thalesfragoso a=therealprof

Signed-off-by: Daniel Egger <daniel@eggers-club.de>

Co-authored-by: Daniel Egger <daniel@eggers-club.de>

Author: bors[bot]

Cargo.toml

@@ -56,7 +56,7 @@ panic-semihosting = "0.5.3"
 cortex-m-semihosting = "0.3.3"
 arrayvec = { version = "0.5.1", default-features = false }
 panic-halt = "0.2.0"
-ssd1306 = "0.3.1"
+ssd1306 = "0.4"
 embedded-graphics = "0.6.2"
 usb-device = "0.2.5"
 usbd-serial = "0.1.0"

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -14,7 +14,7 @@ extern crate stm32f4xx_hal as hal;
 
 use crate::hal::{
     gpio::{gpioa::PA0, Edge, ExtiPin, Input, PullDown},
-    interrupt,
+    interrupt, pac,
     prelude::*,
     rcc::{Clocks, Rcc},
     spi::Spi,
@@ -44,8 +44,7 @@ use embedded_graphics::{
 };
 use micromath::F32Ext;
 
-use ssd1306::{mode::GraphicsMode, Builder as SSD1306Builder};
-use stm32f4::stm32f429;
+use ssd1306::{prelude::*, Builder};
 
 // Set up global state. It's all mutexed up for concurrency safety.
 static ELAPSED_MS: Mutex<Cell<u32>> = Mutex::new(Cell::new(0u32));
@@ -72,7 +71,7 @@ enum StopwatchState {
 
 #[entry]
 fn main() -> ! {
-    let mut dp = stm32f429::Peripherals::take().unwrap();
+    let mut dp = pac::Peripherals::take().unwrap();
     let cp = cortex_m::peripheral::Peripherals::take().unwrap();
     dp.RCC.apb2enr.write(|w| w.syscfgen().enabled());
 
@@ -124,7 +123,8 @@ fn main() -> ! {
     ss.set_low().unwrap();
 
     // Set up the display
-    let mut disp: GraphicsMode<_> = SSD1306Builder::new().connect_spi(spi, dc).into();
+    let interface = SPIInterfaceNoCS::new(spi, dc);
+    let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
     disp.init().unwrap();
     disp.flush().unwrap();
 

examples/rng-display.rs

@@ -26,7 +26,7 @@ use embedded_graphics::{
     fonts::Font6x8, fonts::Text, pixelcolor::BinaryColor, prelude::*, style::TextStyleBuilder,
 };
 
-use ssd1306::{prelude::*, Builder as SSD1306Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 
 use hal::{i2c::I2c, prelude::*, stm32};
 use rand_core::RngCore;
@@ -72,7 +72,8 @@ fn main() -> ! {
         let i2c = I2c::i2c1(dp.I2C1, (scl, sda), 400.khz(), clocks);
 
         // Set up the display
-        let mut disp: GraphicsMode<_> = SSD1306Builder::new().connect_i2c(i2c).into();
+        let interface = I2CDIBuilder::new().init(i2c);
+        let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
         disp.init().unwrap();
 
         // enable the RNG peripheral and its clock

examples/ssd1306-image.rs

@@ -20,7 +20,7 @@ extern crate stm32f4xx_hal as hal;
 use cortex_m_rt::ExceptionFrame;
 use cortex_m_rt::{entry, exception};
 use embedded_graphics::{image::Image, image::ImageRaw, pixelcolor::BinaryColor, prelude::*};
-use ssd1306::{prelude::*, Builder as SSD1306Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 
 use crate::hal::{i2c::I2c, prelude::*, stm32};
 
@@ -48,7 +48,8 @@ fn main() -> ! {
         let btn = gpioc.pc13.into_pull_down_input();
 
         // Set up the display
-        let mut disp: GraphicsMode<_> = SSD1306Builder::new().connect_i2c(i2c).into();
+        let interface = I2CDIBuilder::new().init(i2c);
+        let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
         disp.init().unwrap();
         disp.flush().unwrap();
 

examples/stopwatch-with-ssd1306-and-interrupts.rs

@@ -42,7 +42,7 @@ use embedded_graphics::{
     prelude::*,
     style::TextStyleBuilder,
 };
-use ssd1306::{mode::GraphicsMode, Builder as SSD1306Builder};
+use ssd1306::{prelude::*, Builder, I2CDIBuilder};
 
 // Set up global state. It's all mutexed up for concurrency safety.
 static ELAPSED_MS: Mutex<Cell<u32>> = Mutex::new(Cell::new(0u32));
@@ -82,7 +82,8 @@ fn main() -> ! {
         board_btn.enable_interrupt(&mut dp.EXTI);
         board_btn.trigger_on_edge(&mut dp.EXTI, Edge::FALLING);
 
-        let mut disp: GraphicsMode<_> = SSD1306Builder::new().connect_i2c(i2c).into();
+        let interface = I2CDIBuilder::new().init(i2c);
+        let mut disp: GraphicsMode<_> = Builder::new().connect(interface).into();
         disp.init().unwrap();
         disp.flush().unwrap();