Upgrade embedded-graphics, modernise examples, add animated DVD screensaver (#110)

* Upgrade crate to embedded-graphics 0.6.0-beta.1

Also bumps a few other dev deps

* Fix examples from e-g upgrade

* Squelch unused warnings

* Make rand a dev dependency

It's used in the noise_i2c demo and nowhere else, so shouldn't be
included in release builds.

* Some dep explanations

* Add DVD player bouncing logo demo

* Changelog entry

* Update before build

* Modernise examples and switch to panic_halt

Author: jamwaffles

.circleci/config.yml

@@ -10,6 +10,7 @@ target_steps: &target_steps
     - run: sudo pip install linkchecker
     - run: rustup default ${RUST_VERSION:-stable}
     - run: rustup component add rustfmt
+    - run: cargo update
     - run: |
         SYSROOT=$(rustc --print sysroot)
 

CHANGELOG.md

@@ -16,11 +16,16 @@
 
 ### Changed
 
+- [#110](https://github.com/jamwaffles/ssd1306/pull/110) Upgrade to embedded-graphics 0.6.0-beta.1
 - [#107](https://github.com/jamwaffles/ssd1306/pull/107) Migrate from Travis to CircleCI
 - [#105](https://github.com/jamwaffles/ssd1306/pull/105) Reduce flash usage by around 400 bytes by replacing some internal `unwrap()`s with `as` coercions.
 - [#106](https://github.com/jamwaffles/ssd1306/pull/106) Optimise internals by using iterators to elide bounds checks. Should also speed up `GraphicsMode` (and `embedded-graphics` operations) with a cleaned-up `set_pixel`.
 - [#108](https://github.com/jamwaffles/ssd1306/pull/108) Add an example using `DisplayProperties.draw()` to send a raw buffer of random bytes to the display over I2C.
 
+### Added
+
+- [#110](https://github.com/jamwaffles/ssd1306/pull/110) Add an animated image example `rtfm_dvd` using [RTFM](https://crates.io/crates/cortex-m-rtfm)
+
 ## [0.3.0-alpha.4] - 2020-02-07
 
 ### Added

Cargo.toml

@@ -23,25 +23,28 @@ embedded-hal = "0.2.3"
 
 [dependencies.embedded-graphics]
 optional = true
-version = "=0.6.0-alpha.3"
+version = "=0.6.0-beta.1"
 
 [dev-dependencies]
-cortex-m = "0.6.1"
-cortex-m-rt = "0.6.11"
-panic-semihosting = "0.5.3"
-
-[dependencies.rand]
+cortex-m = "0.6.2"
+cortex-m-rt = "0.6.12"
+cortex-m-rtfm = "0.5.1"
+panic-halt = "0.2.0"
+
+# Used to load BMP images in various examples
+[dev-dependencies.tinybmp]
+version = "0.2.1"
+# Enable embedded-graphics integration
+features = [ "graphics" ]
+
+# Used by the noise_i2c examples
+[dev-dependencies.rand]
 version = "0.7.3"
 default-features = false
 features = [ "small_rng" ]
 
-# Turn on `bmp` feature for examples
-[dev-dependencies.embedded-graphics]
-version = "=0.6.0-alpha.3"
-features = ["bmp"]
-
 [dev-dependencies.stm32f1xx-hal]
-version = "0.5.2"
+version = "0.5.3"
 features = [ "rt", "stm32f103" ]
 
 [features]

README.md

@@ -24,27 +24,31 @@ From [`examples/image_i2c.rs`](examples/image_i2c.rs):
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate stm32f1xx_hal as hal;
-
 use cortex_m_rt::{entry, exception, ExceptionFrame};
-use embedded_graphics::{image::Image, pixelcolor::BinaryColor, prelude::*};
-use hal::{
+use embedded_graphics::{
+    image::{Image, ImageRaw},
+    pixelcolor::BinaryColor,
+    prelude::*,
+};
+use panic_halt as _;
+use ssd1306::{prelude::*, Builder};
+use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
     stm32,
 };
-use ssd1306::{prelude::*, Builder};
 
 #[entry]
 fn main() -> ! {
     let dp = stm32::Peripherals::take().unwrap();
+
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
+
     let clocks = rcc.cfgr.freeze(&mut flash.acr);
+
     let mut afio = dp.AFIO.constrain(&mut rcc.apb2);
+
     let mut gpiob = dp.GPIOB.split(&mut rcc.apb2);
 
     let scl = gpiob.pb8.into_alternate_open_drain(&mut gpiob.crh);
@@ -70,10 +74,11 @@ fn main() -> ! {
 
     disp.init().unwrap();
 
-    let im: Image<BinaryColor> =
-        Image::new(include_bytes!("./rust.raw"), 64, 64).translate(Point::new(32, 0));
+    let raw: ImageRaw<BinaryColor> = ImageRaw::new(include_bytes!("./rust.raw"), 64, 64);
 
-    im.draw(&mut disp);
+    let im = Image::new(&raw, Point::new(32, 0));
+
+    im.draw(&mut disp).unwrap();
 
     disp.flush().unwrap();
 
@@ -84,6 +89,7 @@ fn main() -> ! {
 fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
+
 ```
 
 ## License

examples/bmp_i2c.rs

@@ -21,23 +21,20 @@
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate stm32f1xx_hal as hal;
-
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
-    image::ImageBmp,
+    image::Image,
     pixelcolor::{BinaryColor, Rgb565},
     prelude::*,
 };
-use hal::{
+use panic_halt as _;
+use ssd1306::{prelude::*, Builder};
+use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
     stm32,
 };
-use ssd1306::{prelude::*, Builder};
+use tinybmp::Bmp;
 
 #[entry]
 fn main() -> ! {
@@ -75,11 +72,12 @@ fn main() -> ! {
 
     disp.init().unwrap();
 
-    // The image is an RGB565 encoded BMP, so specifying the type as `ImageBmp<Rgb565>` will read
+    let bmp =
+        Bmp::from_slice(include_bytes!("./rust-pride.bmp")).expect("Failed to load BMP image");
+
+    // The image is an RGB565 encoded BMP, so specifying the type as `Image<Bmp, Rgb565>` will read
     // the pixels correctly
-    let im: ImageBmp<Rgb565> = ImageBmp::new(include_bytes!("./rust-pride.bmp"))
-        .expect("Failed to load BMP image")
-        .translate(Point::new(32, 0));
+    let im: Image<Bmp, Rgb565> = Image::new(&bmp, Point::new(32, 0));
 
     // The display uses `BinaryColor` pixels (on/off only). Here, we `map()` over every pixel
     // and naively convert the color to an on/off value. The logic below simply converts any
@@ -95,7 +93,8 @@ fn main() -> ! {
                 },
             )
         })
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     disp.flush().unwrap();
 

examples/dvd.bmp

@@ -20,25 +20,21 @@
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate stm32f1xx_hal as hal;
-
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
     pixelcolor::BinaryColor,
     prelude::*,
     primitives::{Circle, Rectangle, Triangle},
     style::PrimitiveStyleBuilder,
 };
-use hal::{
+use panic_halt as _;
+use ssd1306::{prelude::*, Builder};
+use stm32f1xx_hal::{
     delay::Delay,
     prelude::*,
     spi::{Mode, Phase, Polarity, Spi},
     stm32,
 };
-use ssd1306::{prelude::*, Builder};
 
 #[entry]
 fn main() -> ! {
@@ -95,7 +91,8 @@ fn main() -> ! {
     // enum to the _Builder_ struct
     Rectangle::new(Point::new(0, 0), Point::new(127, 63))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // triangle
     Triangle::new(
@@ -104,17 +101,20 @@ fn main() -> ! {
         Point::new(16 + 8, yoffset),
     )
     .into_styled(style)
-    .draw(&mut disp);
+    .draw(&mut disp)
+    .unwrap();
 
     // square
     Rectangle::new(Point::new(52, yoffset), Point::new(52 + 16, 16 + yoffset))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // circle
     Circle::new(Point::new(96, yoffset + 8), 8)
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     disp.flush().unwrap();
 

examples/graphics.rs

@@ -17,24 +17,20 @@
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate stm32f1xx_hal as hal;
-
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
     pixelcolor::BinaryColor,
     prelude::*,
     primitives::{Circle, Rectangle, Triangle},
     style::PrimitiveStyleBuilder,
 };
-use hal::{
+use panic_halt as _;
+use ssd1306::{prelude::*, Builder};
+use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
     stm32,
 };
-use ssd1306::{prelude::*, Builder};
 
 #[entry]
 fn main() -> ! {
@@ -84,7 +80,8 @@ fn main() -> ! {
     // enum to the _Builder_ struct
     Rectangle::new(Point::new(0, 0), Point::new(127, 63))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // triangle
     Triangle::new(
@@ -93,17 +90,20 @@ fn main() -> ! {
         Point::new(16 + 8, yoffset),
     )
     .into_styled(style)
-    .draw(&mut disp);
+    .draw(&mut disp)
+    .unwrap();
 
     // square
     Rectangle::new(Point::new(52, yoffset), Point::new(52 + 16, 16 + yoffset))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // circle
     Circle::new(Point::new(96, yoffset + 8), 8)
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     disp.flush().unwrap();
 

examples/graphics_i2c.rs

@@ -17,24 +17,20 @@
 #![no_std]
 #![no_main]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate stm32f1xx_hal as hal;
-
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use embedded_graphics::{
     pixelcolor::BinaryColor,
     prelude::*,
     primitives::{Circle, Rectangle, Triangle},
     style::PrimitiveStyleBuilder,
 };
-use hal::{
+use panic_halt as _;
+use ssd1306::{prelude::*, Builder};
+use stm32f1xx_hal::{
     i2c::{BlockingI2c, DutyCycle, Mode},
     prelude::*,
     stm32,
 };
-use ssd1306::{prelude::*, Builder};
 
 #[entry]
 fn main() -> ! {
@@ -86,7 +82,8 @@ fn main() -> ! {
     // enum to the _Builder_ struct
     Rectangle::new(Point::new(0, 0), Point::new(127, 31))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // triangle
     Triangle::new(
@@ -95,17 +92,20 @@ fn main() -> ! {
         Point::new(16 + 8, yoffset),
     )
     .into_styled(style)
-    .draw(&mut disp);
+    .draw(&mut disp)
+    .unwrap();
 
     // square
     Rectangle::new(Point::new(52, yoffset), Point::new(52 + 16, 16 + yoffset))
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     // circle
     Circle::new(Point::new(96, yoffset + 8), 8)
         .into_styled(style)
-        .draw(&mut disp);
+        .draw(&mut disp)
+        .unwrap();
 
     disp.flush().unwrap();