|
|
|
@ -1,7 +1,7 @@ |
|
|
|
//! Graphics Support for EPDs
|
|
|
|
//! Graphics Support for EPDs
|
|
|
|
|
|
|
|
|
|
|
|
use crate::color::Color; |
|
|
|
use crate::color::Color; |
|
|
|
use embedded_graphics::prelude::*; |
|
|
|
use embedded_graphics::{pixelcolor::BinaryColor, prelude::*}; |
|
|
|
|
|
|
|
|
|
|
|
/// Displayrotation
|
|
|
|
/// Displayrotation
|
|
|
|
#[derive(Clone, Copy)] |
|
|
|
#[derive(Clone, Copy)] |
|
|
|
@ -22,7 +22,7 @@ impl Default for DisplayRotation { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pub trait Display: Drawing<Color> { |
|
|
|
pub trait Display: DrawTarget<BinaryColor> { |
|
|
|
/// Clears the buffer of the display with the chosen background color
|
|
|
|
/// Clears the buffer of the display with the chosen background color
|
|
|
|
fn clear_buffer(&mut self, background_color: Color) { |
|
|
|
fn clear_buffer(&mut self, background_color: Color) { |
|
|
|
for elem in self.get_mut_buffer().iter_mut() { |
|
|
|
for elem in self.get_mut_buffer().iter_mut() { |
|
|
|
@ -45,31 +45,36 @@ pub trait Display: Drawing<Color> { |
|
|
|
/// Helperfunction for the Embedded Graphics draw trait
|
|
|
|
/// Helperfunction for the Embedded Graphics draw trait
|
|
|
|
///
|
|
|
|
///
|
|
|
|
/// Becomes uneccesary when const_generics become stablised
|
|
|
|
/// Becomes uneccesary when const_generics become stablised
|
|
|
|
fn draw_helper<T>(&mut self, width: u32, height: u32, item_pixels: T) |
|
|
|
fn draw_helper( |
|
|
|
where |
|
|
|
&mut self, |
|
|
|
T: IntoIterator<Item = Pixel<Color>>, |
|
|
|
width: u32, |
|
|
|
{ |
|
|
|
height: u32, |
|
|
|
|
|
|
|
pixel: Pixel<BinaryColor>, |
|
|
|
|
|
|
|
) -> Result<(), Self::Error> { |
|
|
|
let rotation = self.rotation(); |
|
|
|
let rotation = self.rotation(); |
|
|
|
let buffer = self.get_mut_buffer(); |
|
|
|
let buffer = self.get_mut_buffer(); |
|
|
|
for Pixel(UnsignedCoord(x, y), color) in item_pixels { |
|
|
|
|
|
|
|
if outside_display(x, y, width, height, rotation) { |
|
|
|
let Pixel(point, color) = pixel; |
|
|
|
continue; |
|
|
|
if outside_display(point, width, height, rotation) { |
|
|
|
|
|
|
|
return Ok(()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Give us index inside the buffer and the bit-position in that u8 which needs to be changed
|
|
|
|
// Give us index inside the buffer and the bit-position in that u8 which needs to be changed
|
|
|
|
let (index, bit) = find_position(x, y, width, height, rotation); |
|
|
|
let (index, bit) = find_position(point.x as u32, point.y as u32, width, height, rotation); |
|
|
|
let index = index as usize; |
|
|
|
let index = index as usize; |
|
|
|
|
|
|
|
|
|
|
|
// "Draw" the Pixel on that bit
|
|
|
|
// "Draw" the Pixel on that bit
|
|
|
|
match color { |
|
|
|
match color { |
|
|
|
Color::Black => { |
|
|
|
// Black
|
|
|
|
|
|
|
|
BinaryColor::On => { |
|
|
|
buffer[index] &= !bit; |
|
|
|
buffer[index] &= !bit; |
|
|
|
} |
|
|
|
} |
|
|
|
Color::White => { |
|
|
|
// White
|
|
|
|
|
|
|
|
BinaryColor::Off => { |
|
|
|
buffer[index] |= bit; |
|
|
|
buffer[index] |= bit; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
Ok(()) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -83,8 +88,10 @@ pub trait Display: Drawing<Color> { |
|
|
|
/// # use epd_waveshare::epd2in9::DEFAULT_BACKGROUND_COLOR;
|
|
|
|
/// # use epd_waveshare::epd2in9::DEFAULT_BACKGROUND_COLOR;
|
|
|
|
/// # use epd_waveshare::prelude::*;
|
|
|
|
/// # use epd_waveshare::prelude::*;
|
|
|
|
/// # use epd_waveshare::graphics::VarDisplay;
|
|
|
|
/// # use epd_waveshare::graphics::VarDisplay;
|
|
|
|
|
|
|
|
/// # use epd_waveshare::color::Black;
|
|
|
|
/// # use embedded_graphics::prelude::*;
|
|
|
|
/// # use embedded_graphics::prelude::*;
|
|
|
|
/// # use embedded_graphics::primitives::{Circle, Line};
|
|
|
|
/// # use embedded_graphics::primitives::{Circle, Line};
|
|
|
|
|
|
|
|
/// # use embedded_graphics::style::PrimitiveStyle;
|
|
|
|
/// let width = 128;
|
|
|
|
/// let width = 128;
|
|
|
|
/// let height = 296;
|
|
|
|
/// let height = 296;
|
|
|
|
///
|
|
|
|
///
|
|
|
|
@ -93,11 +100,9 @@ pub trait Display: Drawing<Color> { |
|
|
|
///
|
|
|
|
///
|
|
|
|
/// display.set_rotation(DisplayRotation::Rotate90);
|
|
|
|
/// display.set_rotation(DisplayRotation::Rotate90);
|
|
|
|
///
|
|
|
|
///
|
|
|
|
/// display.draw(
|
|
|
|
/// let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
|
|
|
|
/// Line::new(Coord::new(0, 120), Coord::new(0, 295))
|
|
|
|
/// .into_styled(PrimitiveStyle::with_stroke(Black, 1))
|
|
|
|
/// .stroke(Some(Color::Black))
|
|
|
|
/// .draw(&mut display);
|
|
|
|
/// .into_iter(),
|
|
|
|
|
|
|
|
/// );
|
|
|
|
|
|
|
|
/// ```
|
|
|
|
/// ```
|
|
|
|
pub struct VarDisplay<'a> { |
|
|
|
pub struct VarDisplay<'a> { |
|
|
|
width: u32, |
|
|
|
width: u32, |
|
|
|
@ -119,12 +124,15 @@ impl<'a> VarDisplay<'a> { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl<'a> Drawing<Color> for VarDisplay<'a> { |
|
|
|
impl<'a> DrawTarget<BinaryColor> for VarDisplay<'a> { |
|
|
|
fn draw<T>(&mut self, item_pixels: T) |
|
|
|
type Error = core::convert::Infallible; |
|
|
|
where |
|
|
|
|
|
|
|
T: IntoIterator<Item = Pixel<Color>>, |
|
|
|
fn draw_pixel(&mut self, pixel: Pixel<BinaryColor>) -> Result<(), Self::Error> { |
|
|
|
{ |
|
|
|
self.draw_helper(self.width, self.height, pixel) |
|
|
|
self.draw_helper(self.width, self.height, item_pixels); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn size(&self) -> Size { |
|
|
|
|
|
|
|
Size::new(self.width, self.height) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -147,7 +155,11 @@ impl<'a> Display for VarDisplay<'a> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Checks if a pos is outside the defined display
|
|
|
|
// Checks if a pos is outside the defined display
|
|
|
|
fn outside_display(x: u32, y: u32, width: u32, height: u32, rotation: DisplayRotation) -> bool { |
|
|
|
fn outside_display(p: Point, width: u32, height: u32, rotation: DisplayRotation) -> bool { |
|
|
|
|
|
|
|
if p.x < 0 || p.y < 0 { |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
let (x, y) = (p.x as u32, p.y as u32); |
|
|
|
match rotation { |
|
|
|
match rotation { |
|
|
|
DisplayRotation::Rotate0 | DisplayRotation::Rotate180 => { |
|
|
|
DisplayRotation::Rotate0 | DisplayRotation::Rotate180 => { |
|
|
|
if x >= width || y >= height { |
|
|
|
if x >= width || y >= height { |
|
|
|
@ -189,10 +201,9 @@ fn find_position(x: u32, y: u32, width: u32, height: u32, rotation: DisplayRotat |
|
|
|
#[cfg(test)] |
|
|
|
#[cfg(test)] |
|
|
|
mod tests { |
|
|
|
mod tests { |
|
|
|
use super::{find_position, outside_display, Display, DisplayRotation, VarDisplay}; |
|
|
|
use super::{find_position, outside_display, Display, DisplayRotation, VarDisplay}; |
|
|
|
|
|
|
|
use crate::color::Black; |
|
|
|
use crate::color::Color; |
|
|
|
use crate::color::Color; |
|
|
|
use embedded_graphics::coord::Coord; |
|
|
|
use embedded_graphics::{prelude::*, primitives::Line, style::PrimitiveStyle}; |
|
|
|
use embedded_graphics::prelude::*; |
|
|
|
|
|
|
|
use embedded_graphics::primitives::Line; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[test] |
|
|
|
#[test] |
|
|
|
fn buffer_clear() { |
|
|
|
fn buffer_clear() { |
|
|
|
@ -228,7 +239,7 @@ mod tests { |
|
|
|
for x in 0..(width + height) { |
|
|
|
for x in 0..(width + height) { |
|
|
|
//limit x because it runs too long
|
|
|
|
//limit x because it runs too long
|
|
|
|
for y in 0..(u32::max_value()) { |
|
|
|
for y in 0..(u32::max_value()) { |
|
|
|
if outside_display(x, y, width, height, rotation2) { |
|
|
|
if outside_display(Point::new(x as i32, y as i32), width, height, rotation2) { |
|
|
|
break; |
|
|
|
break; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
let (idx, _) = find_position(x, y, width, height, rotation2); |
|
|
|
let (idx, _) = find_position(x, y, width, height, rotation2); |
|
|
|
@ -247,11 +258,9 @@ mod tests { |
|
|
|
let mut buffer = [DEFAULT_BACKGROUND_COLOR.get_byte_value(); 128 / 8 * 296]; |
|
|
|
let mut buffer = [DEFAULT_BACKGROUND_COLOR.get_byte_value(); 128 / 8 * 296]; |
|
|
|
let mut display = VarDisplay::new(width, height, &mut buffer); |
|
|
|
let mut display = VarDisplay::new(width, height, &mut buffer); |
|
|
|
|
|
|
|
|
|
|
|
display.draw( |
|
|
|
let _ = Line::new(Point::new(0, 0), Point::new(7, 0)) |
|
|
|
Line::new(Coord::new(0, 0), Coord::new(7, 0)) |
|
|
|
.into_styled(PrimitiveStyle::with_stroke(Black, 1)) |
|
|
|
.stroke(Some(Color::Black)) |
|
|
|
.draw(&mut display); |
|
|
|
.into_iter(), |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let buffer = display.buffer(); |
|
|
|
let buffer = display.buffer(); |
|
|
|
|
|
|
|
|
|
|
|
@ -273,11 +282,9 @@ mod tests { |
|
|
|
|
|
|
|
|
|
|
|
display.set_rotation(DisplayRotation::Rotate90); |
|
|
|
display.set_rotation(DisplayRotation::Rotate90); |
|
|
|
|
|
|
|
|
|
|
|
display.draw( |
|
|
|
let _ = Line::new(Point::new(0, 120), Point::new(0, 295)) |
|
|
|
Line::new(Coord::new(0, 120), Coord::new(0, 295)) |
|
|
|
.into_styled(PrimitiveStyle::with_stroke(Black, 1)) |
|
|
|
.stroke(Some(Color::Black)) |
|
|
|
.draw(&mut display); |
|
|
|
.into_iter(), |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let buffer = display.buffer(); |
|
|
|
let buffer = display.buffer(); |
|
|
|
|
|
|
|
|
|
|
|
|
Caemor
6 years ago