From e0cf10bf4ecda7fb43510880c479871b9655b2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gro=C3=9F?=
 <christoph.gross@student.uni-tuebingen.de>
Date: Wed, 19 Sep 2018 11:44:17 +0200
Subject: [PATCH] Moved Colors into its own module

---
 examples/embedded_linux_epd1in54/src/main.rs | 3 ++-
 examples/embedded_linux_epd4in2/src/main.rs  | 3 ++-
 src/{drawing => }/color.rs                   | 0
 src/drawing/mod.rs                           | 3 +--
 src/epd1in54/mod.rs                          | 4 ++--
 src/epd2in9/mod.rs                           | 2 +-
 src/epd4in2/mod.rs                           | 2 +-
 src/interface/mod.rs                         | 2 +-
 src/lib.rs                                   | 2 ++
 9 files changed, 12 insertions(+), 9 deletions(-)
 rename src/{drawing => }/color.rs (100%)

diff --git a/examples/embedded_linux_epd1in54/src/main.rs b/examples/embedded_linux_epd1in54/src/main.rs
index 1c35601..1e654f7 100644
--- a/examples/embedded_linux_epd1in54/src/main.rs
+++ b/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,
 };
 
diff --git a/examples/embedded_linux_epd4in2/src/main.rs b/examples/embedded_linux_epd4in2/src/main.rs
index 8c9eeeb..76f0fb4 100644
--- a/examples/embedded_linux_epd4in2/src/main.rs
+++ b/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,
 };
 
diff --git a/src/drawing/color.rs b/src/color.rs
similarity index 100%
rename from src/drawing/color.rs
rename to src/color.rs
diff --git a/src/drawing/mod.rs b/src/drawing/mod.rs
index 672010d..979f8e7 100644
--- a/src/drawing/mod.rs
+++ b/src/drawing/mod.rs
@@ -1,8 +1,7 @@
 pub mod font;
 use self::font::Font;
 
-pub mod color;
-use self::color::Color;
+use color::Color;
 
 #[derive(Clone, Copy)]
 pub enum Displayorientation {
diff --git a/src/epd1in54/mod.rs b/src/epd1in54/mod.rs
index ce743c6..2aaac76 100644
--- a/src/epd1in54/mod.rs
+++ b/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;
 
diff --git a/src/epd2in9/mod.rs b/src/epd2in9/mod.rs
index bc6e0e7..80014c9 100644
--- a/src/epd2in9/mod.rs
+++ b/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::*;
 
diff --git a/src/epd4in2/mod.rs b/src/epd4in2/mod.rs
index 24ee3a0..76d463e 100644
--- a/src/epd4in2/mod.rs
+++ b/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;
diff --git a/src/interface/mod.rs b/src/interface/mod.rs
index a3158a5..ddeeb9f 100644
--- a/src/interface/mod.rs
+++ b/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;
diff --git a/src/lib.rs b/src/lib.rs
index 279faa7..7ac964b 100644
--- a/src/lib.rs
+++ b/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")]