WIP

src/epd2in13_v2/graphics.rs

@@ -1,5 +1,6 @@
+use crate::buffer_len;
 use crate::epd2in13_v2::{DEFAULT_BACKGROUND_COLOR, HEIGHT, WIDTH};
-use crate::graphics::{buffer_len, Display, DisplayRotation};
+use crate::graphics::{Display, DisplayRotation};
 use embedded_graphics::pixelcolor::BinaryColor;
 use embedded_graphics::prelude::*;
 

src/epd2in13_v2/mod.rs

@@ -13,6 +13,7 @@ use embedded_hal::{
     digital::v2::{InputPin, OutputPin},
 };
 
+use crate::buffer_len;
 use crate::color::Color;
 use crate::interface::DisplayInterface;
 use crate::traits::{InternalWiAdditions, RefreshLUT, WaveshareDisplay};
@@ -211,7 +212,7 @@ where
     }
 
     fn update_frame(&mut self, spi: &mut SPI, buffer: &[u8]) -> Result<(), SPI::Error> {
-        assert!(buffer.len() == (WIDTH + 7) as usize / 8 * HEIGHT as usize);
+        assert!(buffer.len() == buffer_len(WIDTH as usize, HEIGHT as usize));
         self.set_ram_area(spi, 0, 0, WIDTH - 1, HEIGHT - 1)?;
         self.set_ram_address_counters(spi, 0, 0)?;
 
@@ -304,17 +305,23 @@ where
         self.set_ram_address_counters(spi, 0, 0)?;
 
         self.command(spi, Command::WRITE_RAM)?;
-        self.interface
-            .data_x_times(spi, color, WIDTH * HEIGHT / 8)?;
+        self.interface.data_x_times(
+            spi,
+            color,
+            buffer_len(WIDTH as usize, HEIGHT as usize) as u32,
+        )?;
 
         // Always keep the base buffer equals to current if not doing partial refresh.
         if self.refresh == RefreshLUT::FULL {
             self.set_ram_area(spi, 0, 0, WIDTH - 1, HEIGHT - 1)?;
             self.set_ram_address_counters(spi, 0, 0)?;
 
             self.command(spi, Command::WRITE_RAM_RED)?;
-            self.interface
-                .data_x_times(spi, color, WIDTH * HEIGHT / 8)?;
+            self.interface.data_x_times(
+                spi,
+                color,
+                buffer_len(WIDTH as usize, HEIGHT as usize) as u32,
+            )?;
         }
         Ok(())
     }
@@ -368,7 +375,7 @@ where
         spi: &mut SPI,
         buffer: &[u8],
     ) -> Result<(), SPI::Error> {
-        assert!((WIDTH * HEIGHT / 8) as usize == buffer.len());
+        assert!(buffer_len(WIDTH as usize, HEIGHT as usize) == buffer.len());
         self.set_ram_area(spi, 0, 0, WIDTH - 1, HEIGHT - 1)?;
         self.set_ram_address_counters(spi, 0, 0)?;