From fe97740f0414cf9ef133b80fd3c5dc3577eba3be Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 16 Oct 2018 18:13:43 +0200 Subject: [PATCH] Fix example --- examples/embedded_linux_epd4in2/Cargo.toml | 2 ++ examples/embedded_linux_epd4in2/src/main.rs | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/examples/embedded_linux_epd4in2/Cargo.toml b/examples/embedded_linux_epd4in2/Cargo.toml index 5bb31a6..cf2e8f9 100644 --- a/examples/embedded_linux_epd4in2/Cargo.toml +++ b/examples/embedded_linux_epd4in2/Cargo.toml @@ -11,4 +11,6 @@ eink_waveshare_rs = { path = "../../", default-features = false, features = ["ep linux-embedded-hal = "0.2.0" +embedded-graphics = "0.4.1" + embedded-hal = { version = "0.2.1", features = ["unproven"] } diff --git a/examples/embedded_linux_epd4in2/src/main.rs b/examples/embedded_linux_epd4in2/src/main.rs index 8e61235..ebf93a7 100644 --- a/examples/embedded_linux_epd4in2/src/main.rs +++ b/examples/embedded_linux_epd4in2/src/main.rs @@ -8,11 +8,17 @@ extern crate eink_waveshare_rs; use eink_waveshare_rs::{ EPD4in2, drawing_old::{Graphics}, - drawing::DisplayEink42BlackWhite, + drawing::{DisplayEink42BlackWhite, Buffer}, color::Color, WaveshareDisplay, }; +extern crate embedded_graphics; +use embedded_graphics::coord::Coord; +use embedded_graphics::fonts::Font6x8; +use embedded_graphics::prelude::*; +use embedded_graphics::primitives::{Circle, Line}; + use lin_hal::spidev::{self, SpidevOptions}; use lin_hal::{Pin, Spidev}; use lin_hal::sysfs_gpio::Direction; @@ -63,7 +69,7 @@ impl<'a> InputPin for HackInputPin<'a> { * */ fn main() { - run().map_err(|e| println!("{}", e.to_string())); + run().map_err(|e| println!("{}", e.to_string())).unwrap(); } @@ -208,11 +214,13 @@ fn run() -> Result<(), std::io::Error> { ); epd4in2.update_frame(&mut spi, &display.get_buffer()).unwrap(); - epd4in2.display_frame(&mut spi); + epd4in2.display_frame(&mut spi).expect("display frame new graphics"); if i > 296 { - epd4in2.sleep(&mut spi)?; - return; + + break; } delay.delay_ms(1_000u16); } + println!("Finished tests - going to sleep"); + epd4in2.sleep(&mut spi) }