Make embedded-graphics a dev dependency
e-g-core should be the only e-g dependency required for the driver itself, so this PR changes a few of the imports to reflect that.main
parent
2f31f4bebc
commit
a92eac02a4
|
|
@ -16,19 +16,19 @@ edition = "2018"
|
||||||
# travis-ci = { repository = "caemor/epd-waveshare" }
|
# travis-ci = { repository = "caemor/epd-waveshare" }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
embedded-graphics = { version = "0.7.1", optional = true}
|
|
||||||
embedded-graphics-core = { version = "0.3.2", optional = true}
|
embedded-graphics-core = { version = "0.3.2", optional = true}
|
||||||
embedded-hal = {version = "0.2.4", features = ["unproven"]}
|
embedded-hal = {version = "0.2.4", features = ["unproven"]}
|
||||||
bit_field = "0.10.1"
|
bit_field = "0.10.1"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
embedded-graphics = "0.7.1"
|
||||||
linux-embedded-hal = "0.3"
|
linux-embedded-hal = "0.3"
|
||||||
embedded-hal-mock = "0.7"
|
embedded-hal-mock = "0.7"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["graphics"]
|
default = ["graphics"]
|
||||||
|
|
||||||
graphics = ["embedded-graphics","embedded-graphics-core"]
|
graphics = ["embedded-graphics-core"]
|
||||||
|
|
||||||
# Offers an alternative fast full lut for type_a displays, but the refreshed screen isnt as clean looking
|
# Offers an alternative fast full lut for type_a displays, but the refreshed screen isnt as clean looking
|
||||||
type_a_alternative_faster_lut = []
|
type_a_alternative_faster_lut = []
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd1in54::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd1in54::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 1in54 EPD
|
/// Full size buffer for use with the 1in54 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd1in54b::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd1in54b::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 1in54 EPD
|
/// Full size buffer for use with the 1in54 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd1in54c::{DEFAULT_BACKGROUND_COLOR, HEIGHT, NUM_DISPLAY_BITS, WIDTH};
|
use crate::epd1in54c::{DEFAULT_BACKGROUND_COLOR, HEIGHT, NUM_DISPLAY_BITS, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 1in54c EPD
|
/// Full size buffer for use with the 1in54c EPD
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
use crate::buffer_len;
|
use crate::buffer_len;
|
||||||
use crate::epd2in13_v2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd2in13_v2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 2in13 v2 EPD
|
/// Full size buffer for use with the 2in13 v2 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd2in7b::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd2in7b::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 2in7B EPD
|
/// Full size buffer for use with the 2in7B EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd2in9::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd2in9::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Display with Fullsize buffer for use with the 2in9 EPD
|
/// Display with Fullsize buffer for use with the 2in9 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd2in9::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd2in9::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Display with Fullsize buffer for use with the 2in9 EPD V2
|
/// Display with Fullsize buffer for use with the 2in9 EPD V2
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd2in9bc::{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 crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 2in9b/c EPD
|
/// Full size buffer for use with the 2in9b/c EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd4in2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd4in2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 4in2 EPD
|
/// Full size buffer for use with the 4in2 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd7in5::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd7in5::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 7in5 EPD
|
/// Full size buffer for use with the 7in5 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd7in5_hd::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd7in5_hd::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 7in5 EPD
|
/// Full size buffer for use with the 7in5 EPD
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::epd7in5_v2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
use crate::epd7in5_v2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
|
||||||
use crate::graphics::{Display, DisplayRotation};
|
use crate::graphics::{Display, DisplayRotation};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Full size buffer for use with the 7in5 EPD
|
/// Full size buffer for use with the 7in5 EPD
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
use crate::buffer_len;
|
use crate::buffer_len;
|
||||||
use crate::color::{Color, OctColor, TriColor};
|
use crate::color::{Color, OctColor, TriColor};
|
||||||
use embedded_graphics::pixelcolor::BinaryColor;
|
use embedded_graphics_core::pixelcolor::BinaryColor;
|
||||||
use embedded_graphics_core::prelude::*;
|
use embedded_graphics_core::prelude::*;
|
||||||
|
|
||||||
/// Displayrotation
|
/// Displayrotation
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue