Cleanup

rust-embedded-community · Jun 16, 2020 · 93b15fc · 93b15fc
1 parent 7529a8c
commit 93b15fc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/examples/graphics_i2c_128x32.rs b/examples/graphics_i2c_128x32.rs
@@ -66,7 +66,7 @@ fn main() -> ! {
 
     let interface = I2CDIBuilder::new().init(i2c);
     let mut disp: GraphicsMode<_, _> = Builder::new()
-        .size::<DisplaySize128x32>()
+        .size(DisplaySize128x32)
         .connect(interface)
         .into();
     disp.init().unwrap();

diff --git a/examples/graphics_i2c_72x40.rs b/examples/graphics_i2c_72x40.rs
@@ -66,7 +66,7 @@ fn main() -> ! {
 
     let interface = I2CDIBuilder::new().init(i2c);
     let mut disp: GraphicsMode<_, _> = Builder::new()
-        .size::<DisplaySize72x40>()
+        .size(DisplaySize72x40)
         .connect(interface)
         .into();
     disp.init().unwrap();

diff --git a/src/builder.rs b/src/builder.rs
@@ -33,7 +33,7 @@
 //! let interface = I2CDIBuilder::new().init(i2c);
 //! Builder::new()
 //!     .with_rotation(DisplayRotation::Rotate180)
-//!     .size::<DisplaySize128x32>()
+//!     .size(DisplaySize128x32)
 //!     .connect(interface);
 //! ```
 //!
@@ -66,8 +66,8 @@ pub struct Builder<DSIZE = DisplaySize128x64>
 where
     DSIZE: DisplaySize,
 {
+    size: DSIZE,
     rotation: DisplayRotation,
-    _size: core::marker::PhantomData<DSIZE>,
 }
 
 impl Default for Builder {
@@ -80,8 +80,8 @@ impl Builder {
     /// Create new builder with a default size of 128 x 64 pixels and no rotation.
     pub fn new() -> Self {
         Self {
+            size: DisplaySize128x64,
             rotation: DisplayRotation::Rotate0,
-            _size: core::marker::PhantomData,
         }
     }
 }
@@ -91,10 +91,10 @@ where
     DSIZE: DisplaySize,
 {
     /// Set the size of the display. Supported sizes are defined by [DisplaySize].
-    pub fn size<SIZE: DisplaySize>(self) -> Builder<SIZE> {
+    pub fn size<S: DisplaySize>(self, size: S) -> Builder<S, DROTATION> {
         Builder {
+            size,
             rotation: self.rotation,
-            _size: core::marker::PhantomData,
         }
     }
 
@@ -112,7 +112,7 @@ where
     where
         I: WriteOnlyDataCommand,
     {
-        DisplayProperties::new(interface, self.rotation)
+        DisplayProperties::new(interface, self.size, self.rotation)
     }
 }
 

diff --git a/src/displaysize.rs b/src/displaysize.rs
@@ -33,7 +33,7 @@ pub trait DisplaySize {
     ///
     /// See [`Command::ComPinConfig`](../command/enum.Command.html#variant.ComPinConfig)
     /// for more information
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError>;
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError>;
 }
 
 /// Size information for the common 128x64 variants
@@ -43,7 +43,7 @@ impl DisplaySize for DisplaySize128x64 {
     const HEIGHT: u8 = 64;
     type BufferSize = U1024;
 
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
         Command::ComPinConfig(true, false).send(iface)
     }
 }
@@ -55,7 +55,7 @@ impl DisplaySize for DisplaySize128x32 {
     const HEIGHT: u8 = 32;
     type BufferSize = U512;
 
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
         Command::ComPinConfig(false, false).send(iface)
     }
 }
@@ -67,7 +67,7 @@ impl DisplaySize for DisplaySize96x16 {
     const HEIGHT: u8 = 16;
     type BufferSize = U192;
 
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
         Command::ComPinConfig(false, false).send(iface)
     }
 }
@@ -81,7 +81,7 @@ impl DisplaySize for DisplaySize72x40 {
     const OFFSETY: u8 = 0;
     type BufferSize = U360;
 
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
         Command::ComPinConfig(true, false).send(iface)
     }
 }
@@ -95,7 +95,7 @@ impl DisplaySize for DisplaySize64x48 {
     const OFFSETY: u8 = 0;
     type BufferSize = U384;
 
-    fn configure(iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
+    fn configure(&self, iface: &mut impl WriteOnlyDataCommand) -> Result<(), DisplayError> {
         Command::ComPinConfig(true, false).send(iface)
     }
 }
diff --git a/src/properties.rs b/src/properties.rs
@@ -13,20 +13,24 @@ pub struct DisplayProperties<DI, DSIZE = DisplaySize128x64> {
     iface: DI,
     display_rotation: DisplayRotation,
     addr_mode: AddrMode,
-    _size: core::marker::PhantomData<DSIZE>,
+    size: DSIZE,
 }
 
 impl<DI, DSIZE> DisplayProperties<DI, DSIZE>
 where
     DSIZE: DisplaySize,
 {
     /// Create new DisplayProperties instance
-    pub fn new(iface: DI, display_rotation: DisplayRotation) -> DisplayProperties<DI, DSIZE> {
+    pub fn new(
+        iface: DI,
+        size: DSIZE,
+        rotation: DisplayRotation,
+    ) -> DisplayProperties<DI, DSIZE> {
         DisplayProperties {
             iface,
             display_rotation,
             addr_mode: AddrMode::Page, // reset value
-            _size: core::marker::PhantomData,
+            size,
         }
     }
 }
@@ -62,10 +66,9 @@ where
         Command::ChargePump(true).send(&mut self.iface)?;
         Command::AddressMode(mode).send(&mut self.iface)?;
 
+        self.size.configure(&mut self.iface)?;
         self.set_rotation(display_rotation)?;
 
-        DSIZE::configure(&mut self.iface)?;
-
         self.set_brightness(Brightness::default())?;
         Command::VcomhDeselect(VcomhLevel::Auto).send(&mut self.iface)?;
         Command::AllOn(false).send(&mut self.iface)?;