Anshorei
/
epd-waveshare
mirror of https://github.com/Anshorei/epd-waveshare
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

run cargo fmt over all examples

embedded-hal-1.0
Chris 7 years ago
parent
973b1d8982
commit
559b0efdae
2 changed files with 76 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      examples/embedded_linux_epd1in54/src/main.rs
  2. 71
      examples/embedded_linux_epd2in9/src/main.rs

71
examples/embedded_linux_epd1in54/src/main.rs
Unescape View File

@ -1,17 +1,14 @@
// the library for the embedded linux device // the library for the embedded linux device
extern crate linux_embedded_hal as lin_hal; extern crate linux_embedded_hal as lin_hal;
use lin_hal::spidev::{self, SpidevOptions}; use lin_hal::spidev::{self, SpidevOptions};
use lin_hal::{Pin, Spidev};
use lin_hal::sysfs_gpio::Direction; use lin_hal::sysfs_gpio::Direction;
use lin_hal::Delay; use lin_hal::Delay;
use lin_hal::{Pin, Spidev};
// the eink library // the eink library
extern crate epd_waveshare; extern crate epd_waveshare;
use epd_waveshare::{ use epd_waveshare::{
epd1in54::{ epd1in54::{Buffer1in54, EPD1in54},
EPD1in54,
Buffer1in54,
},
graphics::{Display, DisplayRotation}, graphics::{Display, DisplayRotation},
prelude::*, prelude::*,
}; };
@ -19,7 +16,7 @@ use epd_waveshare::{
// Graphics // Graphics
extern crate embedded_graphics; extern crate embedded_graphics;
use embedded_graphics::coord::Coord; use embedded_graphics::coord::Coord;
use embedded_graphics::fonts::{Font6x8}; use embedded_graphics::fonts::Font6x8;
use embedded_graphics::prelude::*; use embedded_graphics::prelude::*;
//use embedded_graphics::primitives::{Circle, Line}; //use embedded_graphics::primitives::{Circle, Line};
use embedded_graphics::Drawing; use embedded_graphics::Drawing;
@ -48,14 +45,16 @@ fn run() -> Result<(), std::io::Error> {
spi.configure(&options).expect("spi configuration"); spi.configure(&options).expect("spi configuration");
// Configure Digital I/O Pin to be used as Chip Select for SPI // Configure Digital I/O Pin to be used as Chip Select for SPI
let cs_pin = Pin::new(26);//BCM7 CE0 let cs_pin = Pin::new(26); //BCM7 CE0
cs_pin.export().expect("cs_pin export"); cs_pin.export().expect("cs_pin export");
while !cs_pin.is_exported() {} while !cs_pin.is_exported() {}
cs_pin.set_direction(Direction::Out).expect("cs_pin Direction"); cs_pin
.set_direction(Direction::Out)
.expect("cs_pin Direction");
cs_pin.set_value(1).expect("cs_pin Value set to 1"); cs_pin.set_value(1).expect("cs_pin Value set to 1");
// Configure Busy Input Pin // Configure Busy Input Pin
let busy = Pin::new(5);//pin 29 let busy = Pin::new(5); //pin 29
busy.export().expect("busy export"); busy.export().expect("busy export");
while !busy.is_exported() {} while !busy.is_exported() {}
busy.set_direction(Direction::In).expect("busy Direction"); busy.set_direction(Direction::In).expect("busy Direction");
@ -78,7 +77,6 @@ fn run() -> Result<(), std::io::Error> {
// Configure Delay // Configure Delay
let mut delay = Delay {}; let mut delay = Delay {};
// Setup of the needed pins is finished here // Setup of the needed pins is finished here
// Now the "real" usage of the eink-waveshare-rs crate begins // Now the "real" usage of the eink-waveshare-rs crate begins
let mut epd = EPD1in54::new(&mut spi, cs_pin, busy, dc, rst, &mut delay)?; let mut epd = EPD1in54::new(&mut spi, cs_pin, busy, dc, rst, &mut delay)?;
@ -92,51 +90,53 @@ fn run() -> Result<(), std::io::Error> {
let mut display = Display::new(epd.width(), epd.height(), &mut buffer.buffer); let mut display = Display::new(epd.width(), epd.height(), &mut buffer.buffer);
display.set_rotation(DisplayRotation::Rotate0); display.set_rotation(DisplayRotation::Rotate0);
display.draw( display.draw(
Font6x8::render_str("Rotate 0!") Font6x8::render_str("Rotate 0!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate90); display.set_rotation(DisplayRotation::Rotate90);
display.draw( display.draw(
Font6x8::render_str("Rotate 90!") Font6x8::render_str("Rotate 90!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate180); display.set_rotation(DisplayRotation::Rotate180);
display.draw( display.draw(
Font6x8::render_str("Rotate 180!") Font6x8::render_str("Rotate 180!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate270); display.set_rotation(DisplayRotation::Rotate270);
display.draw( display.draw(
Font6x8::render_str("Rotate 270!") Font6x8::render_str("Rotate 270!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
// Display updated frame // Display updated frame
epd.update_frame(&mut spi, &display.buffer()).unwrap(); epd.update_frame(&mut spi, &display.buffer()).unwrap();
epd.display_frame(&mut spi).expect("display frame new graphics"); epd.display_frame(&mut spi)
.expect("display frame new graphics");
delay.delay_ms(5000u16); delay.delay_ms(5000u16);
// a quickly moving `Hello World!` // a quickly moving `Hello World!`
display.set_rotation(DisplayRotation::Rotate0); display.set_rotation(DisplayRotation::Rotate0);
epd.set_lut(&mut spi, Some(RefreshLUT::QUICK)).expect("SET LUT QUICK error"); epd.set_lut(&mut spi, Some(RefreshLUT::QUICK))
.expect("SET LUT QUICK error");
let limit = 20; let limit = 20;
for i in 0..limit { for i in 0..limit {
println!("Moving Hello World. Loop {} from {}", (i+1), limit); println!("Moving Hello World. Loop {} from {}", (i + 1), limit);
display.draw( display.draw(
Font6x8::render_str(" Hello World! ") Font6x8::render_str(" Hello World! ")
@ -145,12 +145,13 @@ fn run() -> Result<(), std::io::Error> {
stroke_color: Some(Color::Black), stroke_color: Some(Color::Black),
stroke_width: 0u8, // Has no effect on fonts stroke_width: 0u8, // Has no effect on fonts
}) })
.translate(Coord::new(5 + i*6, 50)) .translate(Coord::new(5 + i * 6, 50))
.into_iter(), .into_iter(),
); );
epd.update_frame(&mut spi, &display.buffer()).unwrap(); epd.update_frame(&mut spi, &display.buffer()).unwrap();
epd.display_frame(&mut spi).expect("display frame new graphics"); epd.display_frame(&mut spi)
.expect("display frame new graphics");
} }
// Set the EPD to sleep // Set the EPD to sleep

71
examples/embedded_linux_epd2in9/src/main.rs
Unescape View File

@ -1,17 +1,14 @@
// the library for the embedded linux device // the library for the embedded linux device
extern crate linux_embedded_hal as lin_hal; extern crate linux_embedded_hal as lin_hal;
use lin_hal::spidev::{self, SpidevOptions}; use lin_hal::spidev::{self, SpidevOptions};
use lin_hal::{Pin, Spidev};
use lin_hal::sysfs_gpio::Direction; use lin_hal::sysfs_gpio::Direction;
use lin_hal::Delay; use lin_hal::Delay;
use lin_hal::{Pin, Spidev};
// the eink library // the eink library
extern crate epd_waveshare; extern crate epd_waveshare;
use epd_waveshare::{ use epd_waveshare::{
epd2in9::{ epd2in9::{Buffer2in9, EPD2in9},
EPD2in9,
Buffer2in9,
},
graphics::{Display, DisplayRotation}, graphics::{Display, DisplayRotation},
prelude::*, prelude::*,
}; };
@ -19,7 +16,7 @@ use epd_waveshare::{
// Graphics // Graphics
extern crate embedded_graphics; extern crate embedded_graphics;
use embedded_graphics::coord::Coord; use embedded_graphics::coord::Coord;
use embedded_graphics::fonts::{Font6x8}; use embedded_graphics::fonts::Font6x8;
use embedded_graphics::prelude::*; use embedded_graphics::prelude::*;
//use embedded_graphics::primitives::{Circle, Line}; //use embedded_graphics::primitives::{Circle, Line};
use embedded_graphics::Drawing; use embedded_graphics::Drawing;
@ -49,14 +46,16 @@ fn run() -> Result<(), std::io::Error> {
spi.configure(&options).expect("spi configuration"); spi.configure(&options).expect("spi configuration");
// Configure Digital I/O Pin to be used as Chip Select for SPI // Configure Digital I/O Pin to be used as Chip Select for SPI
let cs_pin = Pin::new(26);//BCM7 CE0 let cs_pin = Pin::new(26); //BCM7 CE0
cs_pin.export().expect("cs_pin export"); cs_pin.export().expect("cs_pin export");
while !cs_pin.is_exported() {} while !cs_pin.is_exported() {}
cs_pin.set_direction(Direction::Out).expect("cs_pin Direction"); cs_pin
.set_direction(Direction::Out)
.expect("cs_pin Direction");
cs_pin.set_value(1).expect("cs_pin Value set to 1"); cs_pin.set_value(1).expect("cs_pin Value set to 1");
// Configure Busy Input Pin // Configure Busy Input Pin
let busy = Pin::new(5);//pin 29 let busy = Pin::new(5); //pin 29
busy.export().expect("busy export"); busy.export().expect("busy export");
while !busy.is_exported() {} while !busy.is_exported() {}
busy.set_direction(Direction::In).expect("busy Direction"); busy.set_direction(Direction::In).expect("busy Direction");
@ -79,7 +78,6 @@ fn run() -> Result<(), std::io::Error> {
// Configure Delay // Configure Delay
let mut delay = Delay {}; let mut delay = Delay {};
// Setup of the needed pins is finished here // Setup of the needed pins is finished here
// Now the "real" usage of the eink-waveshare-rs crate begins // Now the "real" usage of the eink-waveshare-rs crate begins
let mut epd = EPD2in9::new(&mut spi, cs_pin, busy, dc, rst, &mut delay)?; let mut epd = EPD2in9::new(&mut spi, cs_pin, busy, dc, rst, &mut delay)?;
@ -96,51 +94,53 @@ fn run() -> Result<(), std::io::Error> {
display.set_rotation(DisplayRotation::Rotate0); display.set_rotation(DisplayRotation::Rotate0);
display.draw( display.draw(
Font6x8::render_str("Rotate 0!") Font6x8::render_str("Rotate 0!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate90); display.set_rotation(DisplayRotation::Rotate90);
display.draw( display.draw(
Font6x8::render_str("Rotate 90!") Font6x8::render_str("Rotate 90!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate180); display.set_rotation(DisplayRotation::Rotate180);
display.draw( display.draw(
Font6x8::render_str("Rotate 180!") Font6x8::render_str("Rotate 180!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
display.set_rotation(DisplayRotation::Rotate270); display.set_rotation(DisplayRotation::Rotate270);
display.draw( display.draw(
Font6x8::render_str("Rotate 270!") Font6x8::render_str("Rotate 270!")
.with_stroke(Some(Color::Black)) .with_stroke(Some(Color::Black))
.with_fill(Some(Color::White)) .with_fill(Some(Color::White))
.translate(Coord::new(5, 50)) .translate(Coord::new(5, 50))
.into_iter(), .into_iter(),
); );
// Display updated frame // Display updated frame
epd.update_frame(&mut spi, &display.buffer()).unwrap(); epd.update_frame(&mut spi, &display.buffer()).unwrap();
epd.display_frame(&mut spi).expect("display frame new graphics"); epd.display_frame(&mut spi)
.expect("display frame new graphics");
delay.delay_ms(5000u16); delay.delay_ms(5000u16);
// a quickly moving `Hello World!` // a quickly moving `Hello World!`
display.set_rotation(DisplayRotation::Rotate0); display.set_rotation(DisplayRotation::Rotate0);
epd.set_lut(&mut spi, Some(RefreshLUT::QUICK)).expect("SET LUT QUICK error"); epd.set_lut(&mut spi, Some(RefreshLUT::QUICK))
.expect("SET LUT QUICK error");
let limit = 20; let limit = 20;
for i in 0..limit { for i in 0..limit {
println!("Moving Hello World. Loop {} from {}", (i+1), limit); println!("Moving Hello World. Loop {} from {}", (i + 1), limit);
display.draw( display.draw(
Font6x8::render_str(" Hello World! ") Font6x8::render_str(" Hello World! ")
@ -149,12 +149,13 @@ fn run() -> Result<(), std::io::Error> {
stroke_color: Some(Color::Black), stroke_color: Some(Color::Black),
stroke_width: 0u8, // Has no effect on fonts stroke_width: 0u8, // Has no effect on fonts
}) })
.translate(Coord::new(5 + i*6, 50)) .translate(Coord::new(5 + i * 6, 50))
.into_iter(), .into_iter(),
); );
epd.update_frame(&mut spi, &display.buffer()).unwrap(); epd.update_frame(&mut spi, &display.buffer()).unwrap();
epd.display_frame(&mut spi).expect("display frame new graphics"); epd.display_frame(&mut spi)
.expect("display frame new graphics");
} }
// Set the EPD to sleep // Set the EPD to sleep

Write Preview
Loading…
Cancel
Save