Upgrade to embedded-graphics 0.7

jamwaffles · jamwaffles · commit 9f2ac6b7b9eb · 2021-07-11T12:48:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ with the [embedded-hal](crates.io/crates/embedded-hal) traits for maximum portab
 
 ## [Unreleased] - ReleaseDate
 
+### Changed
+
+- **(breaking)** [#25](https://github.com/jamwaffles/sh1106/pull/25) Upgrade to `embedded-graphics` 0.7.
+
 ## [0.3.4] - 2020-12-28
 
 ### Fixed
@@ -81,8 +85,8 @@ Upgrade to new embedded-graphics `0.6.0-alpha.1` release. Please see the [embedd
 - **(breaking)** #9 Upgraded to [embedded-graphics](https://crates.io/crates/embedded-graphics) 0.6.0-alpha.1
 
 <!-- next-url -->
-[unreleased]: https://github.com/jamwaffles/sh1106/compare/v0.3.4...HEAD
 
+[unreleased]: https://github.com/jamwaffles/sh1106/compare/v0.3.4...HEAD
 [0.3.4]: https://github.com/jamwaffles/sh1106/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/jamwaffles/sh1106/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/jamwaffles/sh1106/compare/v0.3.1...v0.3.2
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,14 +20,12 @@ circle-ci = { repository = "jamwaffles/sh1106", branch = "master" }
 
 [dependencies]
 embedded-hal = "0.2.3"
-
-[dependencies.embedded-graphics]
-optional = true
-version = "0.6.0"
+embedded-graphics-core = { version = "0.3.2", optional = true }
 
 [dev-dependencies]
 cortex-m = "0.6.0"
 cortex-m-rt = "0.6.10"
+embedded-graphics = "0.7.1"
 panic-semihosting = "0.5.2"
 
 [dev-dependencies.stm32f1xx-hal]
@@ -36,7 +34,8 @@ features = [ "rt", "stm32f103" ]
 
 [features]
 default = ["graphics"]
-graphics = ["embedded-graphics"]
+graphics = ["embedded-graphics-core"]
+
 [profile.dev]
 codegen-units = 1
 incremental = false
diff --git a/README.md b/README.md
@@ -76,12 +76,12 @@ fn main() -> ! {
 
     Text::new("Hello world!", Point::zero())
         .into_styled(TextStyle::new(Font6x8, BinaryColor::On))
-        .draw(&mut disp)
+        .draw(&mut display)
         .unwrap();
 
     Text::new("Hello Rust!", Point::new(0, 16))
         .into_styled(TextStyle::new(Font6x8, BinaryColor::On))
-        .draw(&mut disp)
+        .draw(&mut display)
         .unwrap();
 
     disp.flush().unwrap();
diff --git a/examples/graphics.rs b/examples/graphics.rs
@@ -21,8 +21,7 @@ use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
     pixelcolor::BinaryColor,
     prelude::*,
-    primitives::{Circle, Line, Rectangle},
-    style::PrimitiveStyle,
+    primitives::{Circle, Line, PrimitiveStyle, Rectangle},
 };
 use panic_semihosting as _;
 use sh1106::{prelude::*, Builder};
@@ -53,7 +52,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
@@ -84,12 +83,12 @@ fn main() -> ! {
         .draw(&mut display)
         .unwrap();
 
-    Rectangle::new(Point::new(48, 16), Point::new(48 + 16, 16 + 16))
+    Rectangle::with_corners(Point::new(48, 16), Point::new(48 + 16, 16 + 16))
         .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1))
         .draw(&mut display)
         .unwrap();
 
-    Circle::new(Point::new(96, 16 + 8), 8)
+    Circle::new(Point::new(88, 16), 16)
         .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1))
         .draw(&mut display)
         .unwrap();
diff --git a/examples/graphics_128x32.rs b/examples/graphics_128x32.rs
@@ -11,8 +11,7 @@ use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
     pixelcolor::BinaryColor,
     prelude::*,
-    primitives::{Circle, Line, Rectangle},
-    style::PrimitiveStyle,
+    primitives::{Circle, Line, PrimitiveStyle, Rectangle},
 };
 use panic_semihosting as _;
 use sh1106::{prelude::*, Builder};
@@ -43,7 +42,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
@@ -81,12 +80,12 @@ fn main() -> ! {
         .draw(&mut display)
         .unwrap();
 
-    Rectangle::new(Point::new(48, yoffset), Point::new(48 + 16, 16 + yoffset))
+    Rectangle::with_corners(Point::new(48, yoffset), Point::new(48 + 16, 16 + yoffset))
         .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1))
         .draw(&mut display)
         .unwrap();
 
-    Circle::new(Point::new(96, yoffset + 8), 8)
+    Circle::new(Point::new(88, yoffset), 16)
         .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1))
         .draw(&mut display)
         .unwrap();
diff --git a/examples/image.rs b/examples/image.rs
@@ -58,7 +58,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
@@ -74,7 +74,7 @@ fn main() -> ! {
     display.init().unwrap();
     display.flush().unwrap();
 
-    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64, 64);
+    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64);
 
     Image::new(&im, Point::new(32, 0))
         .draw(&mut display)
diff --git a/examples/image_spi.rs b/examples/image_spi.rs
@@ -75,7 +75,7 @@ fn main() -> ! {
     display.init().unwrap();
     display.flush().unwrap();
 
-    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64, 64);
+    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64);
 
     Image::new(&im, Point::new(32, 0))
         .draw(&mut display)
diff --git a/examples/pixelsquare.rs b/examples/pixelsquare.rs
@@ -53,7 +53,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
diff --git a/examples/rotation.rs b/examples/rotation.rs
@@ -58,7 +58,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
@@ -84,7 +84,7 @@ fn main() -> ! {
 
     let (w, h) = display.get_dimensions();
 
-    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64, 64);
+    let im: ImageRawLE<BinaryColor> = ImageRawLE::new(include_bytes!("./rust.raw"), 64);
 
     Image::new(
         &im,
diff --git a/examples/text.rs b/examples/text.rs
@@ -20,10 +20,10 @@
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
-    fonts::{Font6x8, Text},
+    mono_font::{ascii::FONT_6X10, MonoTextStyleBuilder},
     pixelcolor::BinaryColor,
     prelude::*,
-    style::TextStyle,
+    text::{Baseline, Text},
 };
 use panic_semihosting as _;
 use sh1106::{prelude::*, Builder};
@@ -54,7 +54,7 @@ fn main() -> ! {
         (scl, sda),
         &mut afio.mapr,
         Mode::Fast {
-            frequency: 400_000,
+            frequency: 100_000,
             duty_cycle: DutyCycle::Ratio2to1,
         },
         clocks,
@@ -70,13 +70,16 @@ fn main() -> ! {
     display.init().unwrap();
     display.flush().unwrap();
 
-    Text::new("Hello world!", Point::zero())
-        .into_styled(TextStyle::new(Font6x8, BinaryColor::On))
+    let text_style = MonoTextStyleBuilder::new()
+        .font(&FONT_6X10)
+        .text_color(BinaryColor::On)
+        .build();
+
+    Text::with_baseline("Hello world!", Point::zero(), text_style, Baseline::Top)
         .draw(&mut display)
         .unwrap();
 
-    Text::new("Hello Rust!", Point::new(0, 16))
-        .into_styled(TextStyle::new(Font6x8, BinaryColor::On))
+    Text::with_baseline("Hello Rust!", Point::new(0, 16), text_style, Baseline::Top)
         .draw(&mut display)
         .unwrap();
 
diff --git a/src/mode/graphics.rs b/src/mode/graphics.rs
@@ -168,41 +168,47 @@ where
 }
 
 #[cfg(feature = "graphics")]
-use embedded_graphics::{
-    drawable,
+use embedded_graphics_core::{
+    draw_target::DrawTarget,
     geometry::Size,
-    pixelcolor::{
-        raw::{RawData, RawU1},
-        BinaryColor,
-    },
-    DrawTarget,
+    geometry::{Dimensions, OriginDimensions},
+    pixelcolor::BinaryColor,
+    Pixel,
 };
 
 #[cfg(feature = "graphics")]
-impl<DI> DrawTarget<BinaryColor> for GraphicsMode<DI>
+impl<DI> DrawTarget for GraphicsMode<DI>
 where
     DI: DisplayInterface,
 {
-    type Error = DI::Error;
+    type Color = BinaryColor;
+    type Error = core::convert::Infallible;
 
-    fn draw_pixel(&mut self, pixel: drawable::Pixel<BinaryColor>) -> Result<(), Self::Error> {
-        let drawable::Pixel(pos, color) = pixel;
-
-        // Guard against negative values. All positive i32 values from `pos` can be represented in
-        // the `u32`s that `set_pixel()` accepts...
-        if pos.x < 0 || pos.y < 0 {
-            return Ok(());
-        }
+    fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
+    where
+        I: IntoIterator<Item = Pixel<Self::Color>>,
+    {
+        let bb = self.bounding_box();
 
-        // ... which makes the `as` coercions here safe.
-        self.set_pixel(pos.x as u32, pos.y as u32, RawU1::from(color).into_inner());
+        pixels
+            .into_iter()
+            .filter(|Pixel(pos, _color)| bb.contains(*pos))
+            .for_each(|Pixel(pos, color)| {
+                self.set_pixel(pos.x as u32, pos.y as u32, color.is_on().into())
+            });
 
         Ok(())
     }
+}
 
+#[cfg(feature = "graphics")]
+impl<DI> OriginDimensions for GraphicsMode<DI>
+where
+    DI: DisplayInterface,
+{
     fn size(&self) -> Size {
         let (w, h) = self.get_dimensions();
 
-        Size::new(w as u32, h as u32)
+        Size::new(w.into(), h.into())
     }
 }
