Anshorei/epd-waveshare
1
0
Fork 0
mirror of https://github.com/Anshorei/epd-waveshare.git synced 2026-10-04 06:16:42 +00:00
Code Issues Projects Releases Wiki Activity

Streamline a few things

Browse Source
This commit is contained in:
Chris
2018-10-19 16:26:31 +02:00
parent a1adeb77a4
commit 3b0b5962ec
6 changed files with 27 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/epd1in54/graphics.rs
+9 -28
View File
@@ -1,19 +1,12 @@
use epd1in54::{DEFAULT_BACKGROUND_COLOR, WIDTH, HEIGHT};
use graphics::DisplayDimension;
pub struct DisplayEink1in54BlackWhite {
width: u32,
height: u32,
pub struct Buffer1in54BlackWhite {
pub buffer: [u8; WIDTH as usize * HEIGHT as usize / 8],
}
impl Default for DisplayEink1in54BlackWhite {
impl Default for Buffer1in54BlackWhite {
fn default() -> Self {
DisplayEink1in54BlackWhite {
width: WIDTH,
height: HEIGHT,
Buffer1in54BlackWhite {
buffer: [
DEFAULT_BACKGROUND_COLOR.get_byte_value();
WIDTH as usize * HEIGHT as usize / 8
@@ -22,18 +15,6 @@ impl Default for DisplayEink1in54BlackWhite {
}
}
impl DisplayDimension for DisplayEink1in54BlackWhite {
fn buffer(&mut self) -> &mut [u8] {
&mut self.buffer
}
fn width(&self) -> u32 {
self.width
}
fn height(&self) -> u32 {
self.height
}
}
#[cfg(test)]
mod tests {
@@ -47,7 +28,7 @@ mod tests {
// test buffer length
#[test]
fn graphics_size() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
assert_eq!(display.buffer().len(), 5000);
}
@@ -55,7 +36,7 @@ mod tests {
// test default background color on all bytes
#[test]
fn graphics_default() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
for &byte in display.buffer() {
assert_eq!(byte, DEFAULT_BACKGROUND_COLOR.get_byte_value());
@@ -64,7 +45,7 @@ mod tests {
#[test]
fn graphics_rotation_0() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let mut display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
display.draw(
Line::new(Coord::new(0, 0), Coord::new(7, 0))
@@ -83,7 +64,7 @@ mod tests {
#[test]
fn graphics_rotation_90() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let mut display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
display.set_rotation(DisplayRotation::Rotate90);
display.draw(
@@ -103,7 +84,7 @@ mod tests {
#[test]
fn graphics_rotation_180() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let mut display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
display.set_rotation(DisplayRotation::Rotate180);
display.draw(
@@ -127,7 +108,7 @@ mod tests {
#[test]
fn graphics_rotation_270() {
let mut display1in54 = DisplayEink1in54BlackWhite::default();
let mut display1in54 = Buffer1in54BlackWhite::default();
let mut display = Display::new(WIDTH, HEIGHT, &mut display1in54.buffer);
display.set_rotation(DisplayRotation::Rotate270);
display.draw(