Browse Source

Rename red to chromatic, rename epd2in9b to epd2in9bc

v0.4
Michael Beaumont 2 years ago
parent
commit
b5e647b0d0
  1. 4
      src/color.rs
  2. 16
      src/epd1in54b/mod.rs
  3. 2
      src/epd2in9bc/command.rs
  4. 14
      src/epd2in9bc/graphics.rs
  5. 87
      src/epd2in9bc/mod.rs
  6. 2
      src/lib.rs
  7. 14
      src/traits.rs

4
src/color.rs

@ -24,8 +24,8 @@ pub enum TriColor {
Black,
/// White color
White,
/// Red color
Red,
/// Chromatic color
Chromatic,
}
//TODO: Rename get_bit_value to bit() and get_byte_value to byte() ?

16
src/epd1in54b/mod.rs

@ -101,8 +101,13 @@ where
&mut self,
spi: &mut SPI,
black: &[u8],
red: &[u8],
chromatic: &[u8],
) -> Result<(), SPI::Error> {
self.update_achromatic_frame(spi, black)?;
self.update_chromatic_frame(spi, chromatic)
}
fn update_achromatic_frame(&mut self, spi: &mut SPI, black: &[u8]) -> Result<(), SPI::Error> {
self.wait_until_idle();
self.send_resolution(spi)?;
@ -113,10 +118,17 @@ where
let expanded = expand_bits(*b);
self.interface.data(spi, &expanded)?;
}
Ok(())
}
fn update_chromatic_frame(
&mut self,
spi: &mut SPI,
chromatic: &[u8],
) -> Result<(), SPI::Error> {
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_2)?;
self.interface.data(spi, red)?;
self.interface.data(spi, chromatic)?;
Ok(())
}
}

2
src/epd2in9b/command.rs → src/epd2in9bc/command.rs

@ -1,4 +1,4 @@
//! SPI Commands for the Waveshare 2.9" red E-Ink Display
//! SPI Commands for the Waveshare 2.9" (B/C) E-Ink Display
use crate::traits;
#[allow(dead_code)]

14
src/epd2in9b/graphics.rs → src/epd2in9bc/graphics.rs

@ -1,26 +1,26 @@
use crate::epd2in9b::{DEFAULT_BACKGROUND_COLOR, HEIGHT, NUM_DISPLAY_BITS, WIDTH};
use crate::epd2in9bc::{DEFAULT_BACKGROUND_COLOR, HEIGHT, NUM_DISPLAY_BITS, WIDTH};
use crate::graphics::{Display, DisplayRotation};
use embedded_graphics::pixelcolor::BinaryColor;
use embedded_graphics::prelude::*;
/// Full size buffer for use with the 2in9b EPD
/// Full size buffer for use with the 2in9b/c EPD
///
/// Can also be manually constructed and be used together with VarDisplay
pub struct Display2in9b {
pub struct Display2in9bc {
buffer: [u8; NUM_DISPLAY_BITS as usize],
rotation: DisplayRotation,
}
impl Default for Display2in9b {
impl Default for Display2in9bc {
fn default() -> Self {
Display2in9b {
Display2in9bc {
buffer: [DEFAULT_BACKGROUND_COLOR.get_byte_value(); NUM_DISPLAY_BITS as usize],
rotation: DisplayRotation::default(),
}
}
}
impl DrawTarget<BinaryColor> for Display2in9b {
impl DrawTarget<BinaryColor> for Display2in9bc {
type Error = core::convert::Infallible;
fn draw_pixel(&mut self, pixel: Pixel<BinaryColor>) -> Result<(), Self::Error> {
@ -32,7 +32,7 @@ impl DrawTarget<BinaryColor> for Display2in9b {
}
}
impl Display for Display2in9b {
impl Display for Display2in9bc {
fn buffer(&self) -> &[u8] {
&self.buffer
}

87
src/epd2in9b/mod.rs → src/epd2in9bc/mod.rs

@ -1,5 +1,4 @@
//! A simple Driver for the Waveshare 2.9" (B) E-Ink Display via SPI
//! A simple Driver for the Waveshare 2.9" (B/C) E-Ink Display via SPI
use embedded_hal::{
blocking::{delay::*, spi::Write},
digital::v2::*,
@ -10,11 +9,11 @@ use crate::traits::{
InternalWiAdditions, RefreshLUT, WaveshareDisplay, WaveshareThreeColorDisplay,
};
/// Width of epd2in9b in pixels
/// Width of epd2in9bc in pixels
pub const WIDTH: u32 = 128;
/// Height of epd2in9b in pixels
/// Height of epd2in9bc in pixels
pub const HEIGHT: u32 = 296;
/// Default background color (white) of epd2in9b display
/// Default background color (white) of epd2in9bc display
pub const DEFAULT_BACKGROUND_COLOR: Color = Color::White;
const NUM_DISPLAY_BITS: u32 = WIDTH * HEIGHT / 8;
@ -23,7 +22,7 @@ const IS_BUSY_LOW: bool = true;
const VCOM_DATA_INTERVAL: u8 = 0x07;
const WHITE_BORDER: u8 = 0x70;
const BLACK_BORDER: u8 = 0x30;
const RED_BORDER: u8 = 0xb0;
const CHROMATIC_BORDER: u8 = 0xb0;
const FLOATING_BORDER: u8 = 0xF0;
use crate::color::{Color, TriColor};
@ -34,16 +33,16 @@ use self::command::Command;
#[cfg(feature = "graphics")]
mod graphics;
#[cfg(feature = "graphics")]
pub use self::graphics::Display2in9b;
pub use self::graphics::Display2in9bc;
/// EPD2in9b driver
pub struct EPD2in9b<SPI, CS, BUSY, DC, RST> {
/// EPD2in9bc driver
pub struct EPD2in9bc<SPI, CS, BUSY, DC, RST> {
interface: DisplayInterface<SPI, CS, BUSY, DC, RST>,
color: Color,
}
impl<SPI, CS, BUSY, DC, RST> InternalWiAdditions<SPI, CS, BUSY, DC, RST>
for EPD2in9b<SPI, CS, BUSY, DC, RST>
for EPD2in9bc<SPI, CS, BUSY, DC, RST>
where
SPI: Write<u8>,
CS: OutputPin,
@ -90,7 +89,7 @@ where
}
impl<SPI, CS, BUSY, DC, RST> WaveshareThreeColorDisplay<SPI, CS, BUSY, DC, RST>
for EPD2in9b<SPI, CS, BUSY, DC, RST>
for EPD2in9bc<SPI, CS, BUSY, DC, RST>
where
SPI: Write<u8>,
CS: OutputPin,
@ -102,15 +101,41 @@ where
&mut self,
spi: &mut SPI,
black: &[u8],
red: &[u8],
chromatic: &[u8],
) -> Result<(), SPI::Error> {
self.update_mono_frame(spi, black)?;
self.update_red_frame(spi, red)
self.update_achromatic_frame(spi, black)?;
self.update_chromatic_frame(spi, chromatic)
}
/// Update only the black/white data of the display.
///
/// Finish by calling `update_chromatic_frame`.
fn update_achromatic_frame(&mut self, spi: &mut SPI, black: &[u8]) -> Result<(), SPI::Error> {
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_1)?;
self.interface.data(spi, black)?;
Ok(())
}
/// Update only chromatic data of the display.
///
/// This data takes precedence over the black/white data.
fn update_chromatic_frame(
&mut self,
spi: &mut SPI,
chromatic: &[u8],
) -> Result<(), SPI::Error> {
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_2)?;
self.interface.data(spi, chromatic)?;
self.wait_until_idle();
Ok(())
}
}
impl<SPI, CS, BUSY, DC, RST> WaveshareDisplay<SPI, CS, BUSY, DC, RST>
for EPD2in9b<SPI, CS, BUSY, DC, RST>
for EPD2in9bc<SPI, CS, BUSY, DC, RST>
where
SPI: Write<u8>,
CS: OutputPin,
@ -129,7 +154,7 @@ where
let interface = DisplayInterface::new(cs, busy, dc, rst);
let color = DEFAULT_BACKGROUND_COLOR;
let mut epd = EPD2in9b { interface, color };
let mut epd = EPD2in9bc { interface, color };
epd.init(spi, delay)?;
@ -183,7 +208,7 @@ where
self.interface.data(spi, &buffer)?;
// Clear the red layer
// Clear the chromatic layer
let color = self.color.get_byte_value();
self.interface
@ -231,7 +256,7 @@ where
self.interface.data_x_times(spi, color, NUM_DISPLAY_BITS)?;
// Clear the red
// Clear the chromatic
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_2)?;
self.interface.data_x_times(spi, color, NUM_DISPLAY_BITS)?;
@ -253,7 +278,7 @@ where
}
}
impl<SPI, CS, BUSY, DC, RST> EPD2in9b<SPI, CS, BUSY, DC, RST>
impl<SPI, CS, BUSY, DC, RST> EPD2in9bc<SPI, CS, BUSY, DC, RST>
where
SPI: Write<u8>,
CS: OutputPin,
@ -298,7 +323,7 @@ where
let border = match color {
TriColor::Black => BLACK_BORDER,
TriColor::White => WHITE_BORDER,
TriColor::Red => RED_BORDER,
TriColor::Chromatic => CHROMATIC_BORDER,
};
self.cmd_with_data(
spi,
@ -306,26 +331,4 @@ where
&[border | VCOM_DATA_INTERVAL],
)
}
/// Update only the black/white data of the display.
///
/// Finish by calling `update_red_frame`.
pub fn update_mono_frame(&mut self, spi: &mut SPI, black: &[u8]) -> Result<(), SPI::Error> {
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_1)?;
self.interface.data(spi, black)?;
Ok(())
}
/// Update only red data of the display.
///
/// This data takes precedence over the black/white data.
pub fn update_red_frame(&mut self, spi: &mut SPI, red: &[u8]) -> Result<(), SPI::Error> {
self.interface
.cmd(spi, Command::DATA_START_TRANSMISSION_2)?;
self.interface.data(spi, red)?;
self.wait_until_idle();
Ok(())
}
}

2
src/lib.rs

@ -75,7 +75,7 @@ mod interface;
pub mod epd1in54;
pub mod epd1in54b;
pub mod epd2in9;
pub mod epd2in9b;
pub mod epd2in9bc;
pub mod epd4in2;
pub mod epd7in5;
pub mod epd7in5_v2;

14
src/traits.rs

@ -69,8 +69,20 @@ where
&mut self,
spi: &mut SPI,
black: &[u8],
color: &[u8],
chromatic: &[u8],
) -> Result<(), SPI::Error>;
/// Update only the black/white data of the display.
///
/// This must be finished by calling `update_chromatic_frame`.
fn update_achromatic_frame(&mut self, spi: &mut SPI, black: &[u8]) -> Result<(), SPI::Error>;
/// Update only the chromatic data of the display.
///
/// This should be preceded by a call to `update_achromatic_frame`.
/// This data takes precedence over the black/white data.
fn update_chromatic_frame(&mut self, spi: &mut SPI, chromatic: &[u8])
-> Result<(), SPI::Error>;
}
/// All the functions to interact with the EPDs

Loading…
Cancel
Save