diff --git a/src/epd1in54/mod.rs b/src/epd1in54/mod.rs index 93de08e..f90a814 100644 --- a/src/epd1in54/mod.rs +++ b/src/epd1in54/mod.rs @@ -33,9 +33,9 @@ use type_a::{command::Command, LUT_FULL_UPDATE, LUT_PARTIAL_UPDATE}; use color::Color; -use interface::{WaveshareInterface}; +use traits::{WaveshareInterface}; -use interface::connection_interface::ConnectionInterface; +use traits::connection_interface::ConnectionInterface; /// EPD1in54 driver /// diff --git a/src/epd2in9/mod.rs b/src/epd2in9/mod.rs index 5a86d83..5b8145e 100644 --- a/src/epd2in9/mod.rs +++ b/src/epd2in9/mod.rs @@ -32,9 +32,9 @@ use type_a::{command::Command, LUT_FULL_UPDATE, LUT_PARTIAL_UPDATE}; use color::Color; -use interface::*; +use traits::*; -use interface::connection_interface::ConnectionInterface; +use traits::connection_interface::ConnectionInterface; /// EPD2in9 driver /// diff --git a/src/epd4in2/command.rs b/src/epd4in2/command.rs index 80c016b..60173e8 100644 --- a/src/epd4in2/command.rs +++ b/src/epd4in2/command.rs @@ -1,5 +1,5 @@ //! SPI Commands for the Waveshare 4.2" E-Ink Display -use interface; +use traits; /// EPD4IN2 commands /// /// Should rarely (never?) be needed directly. @@ -155,7 +155,7 @@ pub(crate) enum Command { POWER_SAVING = 0xE3, } -impl interface::Command for Command { +impl traits::Command for Command { /// Returns the address of the command fn address(self) -> u8 { self as u8 @@ -165,7 +165,7 @@ impl interface::Command for Command { #[cfg(test)] mod tests { use super::*; - use interface::Command as CommandTrait; + use traits::Command as CommandTrait; #[test] fn command_addr() { diff --git a/src/epd4in2/mod.rs b/src/epd4in2/mod.rs index 8d84d14..9ab5ab5 100644 --- a/src/epd4in2/mod.rs +++ b/src/epd4in2/mod.rs @@ -51,7 +51,7 @@ use hal::{ digital::*, }; -use interface::{connection_interface::ConnectionInterface, WaveshareInterface, InternalWiAdditions}; +use traits::{connection_interface::ConnectionInterface, WaveshareInterface, InternalWiAdditions}; //The Lookup Tables for the Display mod constants; diff --git a/src/lib.rs b/src/lib.rs index 42ceaf3..5e34505 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -50,8 +50,8 @@ use hal::spi::{Mode, Phase, Polarity}; #[cfg(feature = "graphics")] pub mod drawing; -mod interface; -pub use interface::{WaveshareInterface}; +mod traits; +pub use traits::{WaveshareInterface}; pub mod color; diff --git a/src/interface/connection_interface.rs b/src/traits/connection_interface.rs similarity index 99% rename from src/interface/connection_interface.rs rename to src/traits/connection_interface.rs index d55750e..842adb0 100644 --- a/src/interface/connection_interface.rs +++ b/src/traits/connection_interface.rs @@ -3,7 +3,7 @@ use hal::{ digital::*, }; -use interface::Command; +use traits::Command; /// The Connection Interface of all (?) Waveshare EPD-Devices /// diff --git a/src/interface/mod.rs b/src/traits/mod.rs similarity index 100% rename from src/interface/mod.rs rename to src/traits/mod.rs diff --git a/src/type_a/command.rs b/src/type_a/command.rs index 5272c07..36d6027 100644 --- a/src/type_a/command.rs +++ b/src/type_a/command.rs @@ -1,6 +1,6 @@ //! SPI Commands for the Waveshare 2.9" and 1.54" E-Ink Display -use interface; +use traits; /// EPD1in54 and EPD2IN9 commands /// @@ -71,7 +71,7 @@ pub(crate) enum Command { NOP = 0xFF, } -impl interface::Command for Command { +impl traits::Command for Command { /// Returns the address of the command fn address(self) -> u8 { self as u8 @@ -81,7 +81,7 @@ impl interface::Command for Command { #[cfg(test)] mod tests { use super::Command; - use interface::Command as CommandTrait; + use traits::Command as CommandTrait; #[test] fn command_addr() {