Upgrade examples/readme to e-g 0.7

Author: jamwaffles

README.md

@@ -84,14 +84,15 @@ fn main() -> ! {
 
     let (w, h) = disp.dimensions();
 
-    let bmp = Bmp::from_slice(include_bytes!("./rust-pride.bmp")).unwrap();
+    let bmp =
+        Bmp::from_slice(include_bytes!("./rust-pride.bmp")).expect("Failed to load BMP image");
 
-    let im: Image<Bmp, Rgb565> = Image::new(&bmp, Point::zero());
+    let im: Image<Bmp<Rgb565>> = Image::new(&bmp, Point::zero());
 
     // Position image in the center of the display
     let moved = im.translate(Point::new(
-        (w as u32 - bmp.width()) as i32 / 2,
-        (h as u32 - bmp.height()) as i32 / 2,
+        (w as u32 - bmp.size().width) as i32 / 2,
+        (h as u32 - bmp.size().height) as i32 / 2,
     ));
 
     moved.draw(&mut disp).unwrap();

examples/bmp.rs

@@ -80,14 +80,15 @@ fn main() -> ! {
 
     let (w, h) = disp.dimensions();
 
-    let bmp = Bmp::from_slice(include_bytes!("./rust-pride.bmp")).unwrap();
+    let bmp =
+        Bmp::from_slice(include_bytes!("./rust-pride.bmp")).expect("Failed to load BMP image");
 
-    let im: Image<Bmp, Rgb565> = Image::new(&bmp, Point::zero());
+    let im: Image<Bmp<Rgb565>> = Image::new(&bmp, Point::zero());
 
     // Position image in the center of the display
     let moved = im.translate(Point::new(
-        (w as u32 - bmp.width()) as i32 / 2,
-        (h as u32 - bmp.height()) as i32 / 2,
+        (w as u32 - bmp.size().width) as i32 / 2,
+        (h as u32 - bmp.size().height) as i32 / 2,
     ));
 
     moved.draw(&mut disp).unwrap();

examples/graphics.rs

@@ -25,8 +25,7 @@ use embedded_graphics::{
     geometry::Point,
     pixelcolor::Rgb565,
     prelude::*,
-    primitives::{Circle, Rectangle, Triangle},
-    style::PrimitiveStyleBuilder,
+    primitives::{Circle, PrimitiveStyle, Rectangle, Triangle},
 };
 use panic_semihosting as _;
 use ssd1331::{DisplayRotation::Rotate0, Ssd1331};
@@ -86,32 +85,17 @@ fn main() -> ! {
         Point::new(8 + 16, 16 + 16),
         Point::new(8 + 8, 16),
     )
-    .into_styled(
-        PrimitiveStyleBuilder::new()
-            .stroke_color(Rgb565::RED)
-            .stroke_width(1)
-            .build(),
-    )
+    .into_styled(PrimitiveStyle::with_stroke(Rgb565::RED, 1))
     .draw(&mut disp)
     .unwrap();
 
-    Rectangle::new(Point::new(36, 16), Point::new(36 + 16, 16 + 16))
-        .into_styled(
-            PrimitiveStyleBuilder::new()
-                .stroke_color(Rgb565::GREEN)
-                .stroke_width(1)
-                .build(),
-        )
+    Rectangle::with_corners(Point::new(36, 16), Point::new(36 + 16, 16 + 16))
+        .into_styled(PrimitiveStyle::with_stroke(Rgb565::GREEN, 1))
         .draw(&mut disp)
         .unwrap();
 
-    Circle::new(Point::new(72, 16 + 8), 8)
-        .into_styled(
-            PrimitiveStyleBuilder::new()
-                .stroke_color(Rgb565::BLUE)
-                .stroke_width(1)
-                .build(),
-        )
+    Circle::new(Point::new(64, 16), 16)
+        .into_styled(PrimitiveStyle::with_stroke(Rgb565::BLUE, 1))
         .draw(&mut disp)
         .unwrap();
 

examples/image.rs

@@ -85,7 +85,7 @@ fn main() -> ! {
 
     // Loads an 86x64px image encoded in LE (Little Endian) format. This image is a 16BPP image of
     // the Rust mascot, Ferris.
-    let im = ImageRawLE::new(include_bytes!("./ferris.raw"), 86, 64);
+    let im = ImageRawLE::new(include_bytes!("./ferris.raw"), 86);
 
     Image::new(&im, Point::new((96 - 86) / 2, 0))
         .draw(&mut disp)

examples/rotation.rs

@@ -86,13 +86,11 @@ fn main() -> ! {
 
     // Load a 1BPP 64x64px image with LE (Little Endian) encoding of the Rust logo, white foreground
     // black background
-    let im = ImageRawLE::<BinaryColor>::new(include_bytes!("./rust.raw"), 64, 64);
+    let im = ImageRawLE::<BinaryColor>::new(include_bytes!("./rust.raw"), 64);
 
-    // Map on/off image colours to Rgb565::BLACK/Rgb565::WHITE
-    im.into_iter()
-        .map(|p| Pixel(p.0, p.1.into()))
-        .draw(&mut disp)
-        .unwrap();
+    // Use `color_converted` to create a wrapper that converts BinaryColors to Rgb565 colors to send
+    // to the display.
+    im.draw(&mut disp.color_converted()).unwrap();
 
     disp.flush().unwrap();
 

examples/text.rs

@@ -1,5 +1,5 @@
 //! Print "Hello world!" with "Hello rust!" underneath. Uses the `embedded_graphics` crate to draw
-//! the text with a 6x8 pixel font.
+//! the text with a 6x10 and 9x18 pixel monospace font.
 //!
 //! This example is for the STM32F103 "Blue Pill" board using a 4 wire interface to the display on
 //! SPI1.
@@ -22,13 +22,14 @@
 
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
-    egtext,
-    fonts::{Font6x8, Text},
     geometry::Point,
+    mono_font::{
+        ascii::{FONT_6X10, FONT_9X18},
+        MonoTextStyleBuilder,
+    },
     pixelcolor::Rgb565,
     prelude::*,
-    style::TextStyleBuilder,
-    text_style,
+    text::{Baseline, Text},
 };
 use panic_semihosting as _;
 use ssd1331::{DisplayRotation::Rotate0, Ssd1331};
@@ -83,34 +84,28 @@ fn main() -> ! {
     disp.init().unwrap();
     disp.flush().unwrap();
 
-    // Red with a small amount of green creates a deep orange colour
-    let rust = Rgb565::new(0xff, 0x07, 0x00);
-
-    Text::new("Hello world!", Point::zero())
-        .into_styled(
-            TextStyleBuilder::new(Font6x8)
-                .text_color(Rgb565::WHITE)
-                .build(),
-        )
-        .draw(&mut disp)
-        .unwrap();
+    let white_style = MonoTextStyleBuilder::new()
+        .font(&FONT_6X10)
+        .text_color(Rgb565::WHITE)
+        .build();
 
-    Text::new("Hello Rust!", Point::new(0, 16))
-        .into_styled(TextStyleBuilder::new(Font6x8).text_color(rust).build())
+    Text::with_baseline("Hello world!", Point::zero(), white_style, Baseline::Top)
         .draw(&mut disp)
         .unwrap();
 
-    // Macros can also be used
-    egtext!(
-        text = "Hello macros!",
-        top_left = (0, 0),
-        style = text_style!(
-            font = Font6x8,
-            text_color = Rgb565::RED,
-            background_color = Rgb565::GREEN
-        )
+    // Red with a small amount of green creates a deep orange colour
+    let rust_style = MonoTextStyleBuilder::new()
+        .font(&FONT_9X18)
+        .text_color(Rgb565::new(0xff, 0x07, 0x00))
+        .build();
+
+    Text::with_baseline(
+        "Hello Rust!",
+        // Position this text below "Hello world!", using the previous font's height
+        Point::new(0, white_style.font.character_size.height as i32),
+        rust_style,
+        Baseline::Top,
     )
-    .translate(Point::new(0, 24))
     .draw(&mut disp)
     .unwrap();
 

src/display.rs

@@ -61,7 +61,7 @@ const BUF_SIZE: usize = 96 * 64 * 2;
 ///     .draw(&mut display)
 ///     .unwrap();
 ///
-/// Circle::new(Point::new(72, 16 + 8), 8)
+/// Circle::new(Point::new(64, 16), 16)
 ///     .into_styled(PrimitiveStyle::with_stroke(Rgb565::BLUE, 1))
 ///     .draw(&mut display)
 ///     .unwrap();