Replace bwrbit with DisplayMode enum

Author: yurinnick

examples/epd4in2_variable_size.rs

@@ -70,7 +70,8 @@ fn main() -> Result<(), std::io::Error> {
     let (x, y, width, height) = (50, 50, 250, 250);
 
     let mut buffer = [epd4in2::DEFAULT_BACKGROUND_COLOR.get_byte_value(); 62500]; //250*250
-    let mut display = VarDisplay::new(width, height, &mut buffer, false).unwrap();
+    let mut display =
+        VarDisplay::new(width, height, &mut buffer, DisplayMode::BwrBitOff as u8).unwrap();
     display.set_rotation(DisplayRotation::Rotate0);
     draw_text(&mut display, "Rotate 0!", 5, 50);
 

src/color.rs

@@ -3,6 +3,7 @@
 //! EPD representation of multicolor with separate buffers
 //! for each bit makes it hard to properly represent colors here
 
+use crate::prelude::DisplayMode;
 #[cfg(feature = "graphics")]
 use embedded_graphics_core::pixelcolor::BinaryColor;
 #[cfg(feature = "graphics")]
@@ -77,21 +78,21 @@ pub trait ColorType: PixelColor {
 
     /// Return the data used to set a pixel color
     ///
-    /// * bwrbit is used to tell the value of the unused bit when a chromatic
+    /// * MODE is used to tell the value of the unused bit when a chromatic
     /// color is set (TriColor only as for now)
     /// * pos is the pixel position in the line, used to know which pixels must be set
     ///
     /// Return values are :
     /// * .0 is the mask used to exclude this pixel from the byte (eg: 0x7F in BiColor)
     /// * .1 are the bits used to set the color in the byte (eg: 0x80 in BiColor)
     ///      this is u16 because we set 2 bytes in case of split buffer
-    fn bitmask(&self, bwrbit: bool, pos: u32) -> (u8, u16);
+    fn bitmask(&self, mode: DisplayMode, pos: u32) -> (u8, u16);
 }
 
 impl ColorType for Color {
     const BITS_PER_PIXEL_PER_BUFFER: usize = 1;
     const BUFFER_COUNT: usize = 1;
-    fn bitmask(&self, _bwrbit: bool, pos: u32) -> (u8, u16) {
+    fn bitmask(&self, _mode: DisplayMode, pos: u32) -> (u8, u16) {
         let bit = 0x80 >> (pos % 8);
         match self {
             Color::Black => (!bit, 0u16),
@@ -104,16 +105,23 @@ impl ColorType for TriColor {
     const BITS_PER_PIXEL_PER_BUFFER: usize = 1;
     const BUFFER_COUNT: usize = 2;
 
-    fn bitmask(&self, bwrbit: bool, pos: u32) -> (u8, u16) {
+    fn bitmask(&self, mode: DisplayMode, pos: u32) -> (u8, u16) {
         let bit = 0x80 >> (pos % 8);
-        let mask = match self {
-            TriColor::Black => (bit as u16) << 8,
-            TriColor::White => (bit as u16) << 8 | bit as u16,
-            TriColor::Chromatic => if bwrbit {
-                // (bit as u16) << 8
-                0u16
-            } else {
-                (bit as u16) << 8 | bit as u16
+        let mask = match mode {
+            DisplayMode::BwrBitOnColorInverted => match self {
+                TriColor::Black => (bit as u16) << 8,
+                TriColor::White => (bit as u16) << 8 | bit as u16,
+                TriColor::Chromatic => 0u16,
+            },
+            DisplayMode::BwrBitOn => match self {
+                TriColor::Black => 0u16,
+                TriColor::White => bit as u16,
+                TriColor::Chromatic => (bit as u16) << 8,
+            },
+            DisplayMode::BwrBitOff => match self {
+                TriColor::Black => 0u16,
+                TriColor::White => bit as u16,
+                TriColor::Chromatic => (bit as u16) << 8 | bit as u16,
             },
         };
         (!bit, mask)
@@ -123,7 +131,7 @@ impl ColorType for TriColor {
 impl ColorType for OctColor {
     const BITS_PER_PIXEL_PER_BUFFER: usize = 4;
     const BUFFER_COUNT: usize = 1;
-    fn bitmask(&self, _bwrbit: bool, pos: u32) -> (u8, u16) {
+    fn bitmask(&self, _mode: DisplayMode, pos: u32) -> (u8, u16) {
         let mask = !(0xF0 >> (pos % 2));
         let bits = self.get_nibble() as u16;
         (mask, if pos % 2 == 1 { bits } else { bits << 4 })

src/epd1in54/mod.rs

@@ -75,7 +75,7 @@ use crate::interface::DisplayInterface;
 pub type Display1in54 = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd1in54b/mod.rs

@@ -34,7 +34,7 @@ use crate::buffer_len;
 pub type Display1in54b = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd1in54c/mod.rs

@@ -31,7 +31,7 @@ use crate::buffer_len;
 pub type Display1in54c = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd2in13_v2/mod.rs

@@ -33,7 +33,7 @@ use self::constants::{LUT_FULL_UPDATE, LUT_PARTIAL_UPDATE};
 pub type Display2in13 = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd2in13bc/mod.rs

@@ -88,7 +88,7 @@ use crate::buffer_len;
 pub type Display2in13bc = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    true,
+    { crate::graphics::DisplayMode::BwrBitOn as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize * 2) },
     TriColor,
 >;

src/epd2in7b/mod.rs

@@ -36,7 +36,7 @@ use crate::buffer_len;
 pub type Display2in7b = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd2in9/mod.rs

@@ -71,7 +71,7 @@ use crate::interface::DisplayInterface;
 pub type Display2in9 = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;

src/epd2in9_v2/mod.rs

@@ -94,7 +94,7 @@ use crate::traits::QuickRefresh;
 pub type Display2in9 = crate::graphics::Display<
     WIDTH,
     HEIGHT,
-    false,
+    { crate::graphics::DisplayMode::BwrBitOff as u8 },
     { buffer_len(WIDTH as usize, HEIGHT as usize) },
     Color,
 >;