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

Switch to embedded graphics core

main
Mitch Souders 2021-08-24 10:37:47 -07:00
parent 875cc0dae3
commit e89c51cb84
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/color.rs
View File

@ -1,9 +1,9 @@
//! B/W Color for EPDs //! B/W Color for EPDs
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
use embedded_graphics::pixelcolor::BinaryColor; use embedded_graphics_core::pixelcolor::BinaryColor;
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
use embedded_graphics::pixelcolor::PixelColor; use embedded_graphics_core::pixelcolor::PixelColor;
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
pub use BinaryColor::Off as White; pub use BinaryColor::Off as White;
@ -83,7 +83,7 @@ impl From<BinaryColor> for OctColor {
} }
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
impl From<OctColor> for embedded_graphics::pixelcolor::Rgb888 { impl From<OctColor> for embedded_graphics_core::pixelcolor::Rgb888 {
fn from(b: OctColor) -> Self { fn from(b: OctColor) -> Self {
let (r, b, g) = b.rgb(); let (r, b, g) = b.rgb();
Self::new(r, b, g) Self::new(r, b, g)
@ -91,9 +91,9 @@ impl From<OctColor> for embedded_graphics::pixelcolor::Rgb888 {
} }
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
impl From<embedded_graphics::pixelcolor::Rgb888> for OctColor { impl From<embedded_graphics_core::pixelcolor::Rgb888> for OctColor {
fn from(p: embedded_graphics::pixelcolor::Rgb888) -> OctColor { fn from(p: embedded_graphics_core::pixelcolor::Rgb888) -> OctColor {
use embedded_graphics::prelude::RgbColor; use embedded_graphics_core::prelude::RgbColor;
let colors = [ let colors = [
OctColor::Black, OctColor::Black,
OctColor::White, OctColor::White,
@ -126,16 +126,16 @@ impl From<embedded_graphics::pixelcolor::Rgb888> for OctColor {
} }
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
impl From<embedded_graphics::pixelcolor::raw::RawU4> for OctColor { impl From<embedded_graphics_core::pixelcolor::raw::RawU4> for OctColor {
fn from(b: embedded_graphics::pixelcolor::raw::RawU4) -> Self { fn from(b: embedded_graphics_core::pixelcolor::raw::RawU4) -> Self {
use embedded_graphics::prelude::RawData; use embedded_graphics_core::prelude::RawData;
OctColor::from_nibble(b.into_inner()).unwrap() OctColor::from_nibble(b.into_inner()).unwrap()
} }
} }
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
impl PixelColor for OctColor { impl PixelColor for OctColor {
type Raw = embedded_graphics::pixelcolor::raw::RawU4; type Raw = embedded_graphics_core::pixelcolor::raw::RawU4;
} }
impl OctColor { impl OctColor {