Moved Colors into its own module

examples/embedded_linux_epd1in54/src/main.rs

@@ -7,7 +7,8 @@ extern crate eink_waveshare_rs;
 
 use eink_waveshare_rs::{
     EPD1in54, 
-    drawing::{Graphics, color::Color}, 
+    //drawing::{Graphics},
+    color::Color,
     WaveshareInterface,
 };
 

examples/embedded_linux_epd4in2/src/main.rs

@@ -7,7 +7,8 @@ extern crate eink_waveshare_rs;
 
 use eink_waveshare_rs::{
     EPD4in2, 
-    drawing::{Graphics, color::Color}, 
+    drawing::{Graphics},
+    color::Color, 
     WaveshareInterface,
 };
 

src/drawing/mod.rs

@@ -1,8 +1,7 @@
 pub mod font;
 use self::font::Font;
 
-pub mod color;
+use color::Color;
-use self::color::Color;
 
 #[derive(Clone, Copy)]
 pub enum Displayorientation {

src/epd1in54/mod.rs

@@ -31,9 +31,9 @@ use hal::{
 
 use type_a::{command::Command, LUT_FULL_UPDATE, LUT_PARTIAL_UPDATE};
 
-use drawing::color::Color;
+use color::Color;
 
-use interface::*;
+use interface::{WaveshareInterface};
 
 use interface::connection_interface::ConnectionInterface;
 

src/epd2in9/mod.rs

@@ -30,7 +30,7 @@ use hal::{
 
 use type_a::{command::Command, LUT_FULL_UPDATE, LUT_PARTIAL_UPDATE};
 
-use drawing::color::Color;
+use color::Color;
 
 use interface::*;
 

src/epd4in2/mod.rs

@@ -57,7 +57,7 @@ use interface::{connection_interface::ConnectionInterface, WaveshareInterface, I
 mod constants;
 use self::constants::*;
 
-use drawing::color::Color;
+use color::Color;
 
 pub mod command;
 use self::command::Command;

src/interface/mod.rs

@@ -4,7 +4,7 @@ use hal::{
     digital::*,
 };
 
-use drawing::color::Color;
+use color::Color;
 
 /// Interface for the physical connection between display and the controlling device
 pub(crate) mod connection_interface;

src/lib.rs

@@ -52,6 +52,8 @@ pub mod drawing;
 mod interface;
 pub use interface::{WaveshareInterface};
 
+pub mod color;
+
 #[cfg(feature = "epd4in2")]
 mod epd4in2;
 #[cfg(feature = "epd4in2")]