diff --git a/src/epd1in54/mod.rs b/src/epd1in54/mod.rs index 1edac11..99f0d4c 100644 --- a/src/epd1in54/mod.rs +++ b/src/epd1in54/mod.rs @@ -112,11 +112,8 @@ where // 1 .. B[6:0] = 0xCE | 0xD6 // 1 .. C[6:0] = 0x8D | 0x9D //TODO: test - self.interface.cmd_with_data( - spi, - Command::BoosterSoftStartControl, - &[0xD7, 0xD6, 0x9D], - )?; + self.interface + .cmd_with_data(spi, Command::BoosterSoftStartControl, &[0xD7, 0xD6, 0x9D])?; // One Databyte with value 0xA8 for 7V VCOM self.interface diff --git a/src/epd1in54b/mod.rs b/src/epd1in54b/mod.rs index 8441508..25a5b48 100644 --- a/src/epd1in54b/mod.rs +++ b/src/epd1in54b/mod.rs @@ -111,8 +111,7 @@ where self.wait_until_idle(); self.send_resolution(spi)?; - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; for b in black { let expanded = expand_bits(*b); @@ -126,8 +125,7 @@ where spi: &mut SPI, chromatic: &[u8], ) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data(spi, chromatic)?; Ok(()) } @@ -209,8 +207,7 @@ where self.wait_until_idle(); self.send_resolution(spi)?; - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; for b in buffer { // Two bits per pixel @@ -224,8 +221,7 @@ where let color = self.color.get_byte_value(); let nbits = WIDTH * (HEIGHT / 8); - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data_x_times(spi, color, nbits)?; //NOTE: Example code has a delay here @@ -264,16 +260,14 @@ where let color = DEFAULT_BACKGROUND_COLOR.get_byte_value(); // Clear the black - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; // Uses 2 bits per pixel self.interface .data_x_times(spi, color, 2 * (WIDTH * HEIGHT / 8))?; // Clear the red - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface .data_x_times(spi, color, WIDTH * HEIGHT / 8)?; Ok(()) diff --git a/src/epd2in7b/mod.rs b/src/epd2in7b/mod.rs index fc85eab..37ae3b5 100644 --- a/src/epd2in7b/mod.rs +++ b/src/epd2in7b/mod.rs @@ -160,13 +160,11 @@ where } fn update_frame(&mut self, spi: &mut SPI, buffer: &[u8]) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.send_buffer_helper(spi, buffer)?; // Clear chromatic layer since we won't be using it here - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface .data_x_times(spi, !self.color.get_byte_value(), WIDTH * HEIGHT / 8)?; @@ -217,15 +215,13 @@ where self.wait_until_idle(); let color_value = self.color.get_byte_value(); - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface .data_x_times(spi, color_value, WIDTH * HEIGHT / 8)?; self.interface.cmd(spi, Command::DataStop)?; - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface .data_x_times(spi, color_value, WIDTH * HEIGHT / 8)?; self.interface.cmd(spi, Command::DataStop)?; @@ -294,8 +290,7 @@ where spi: &mut SPI, achromatic: &[u8], ) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.send_buffer_helper(spi, achromatic)?; @@ -310,8 +305,7 @@ where spi: &mut SPI, chromatic: &[u8], ) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.send_buffer_helper(spi, chromatic)?; diff --git a/src/epd2in9/mod.rs b/src/epd2in9/mod.rs index 0f25b7b..99d003c 100644 --- a/src/epd2in9/mod.rs +++ b/src/epd2in9/mod.rs @@ -111,11 +111,8 @@ where // 1 .. B[6:0] = 0xCE | 0xD6 // 1 .. C[6:0] = 0x8D | 0x9D //TODO: test - self.interface.cmd_with_data( - spi, - Command::BoosterSoftStartControl, - &[0xD7, 0xD6, 0x9D], - )?; + self.interface + .cmd_with_data(spi, Command::BoosterSoftStartControl, &[0xD7, 0xD6, 0x9D])?; // One Databyte with value 0xA8 for 7V VCOM self.interface diff --git a/src/epd2in9bc/mod.rs b/src/epd2in9bc/mod.rs index 5a81342..6f76602 100644 --- a/src/epd2in9bc/mod.rs +++ b/src/epd2in9bc/mod.rs @@ -165,8 +165,7 @@ where /// /// Finish by calling `update_chromatic_frame`. fn update_achromatic_frame(&mut self, spi: &mut SPI, black: &[u8]) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface.data(spi, black)?; Ok(()) } @@ -179,8 +178,7 @@ where spi: &mut SPI, chromatic: &[u8], ) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data(spi, chromatic)?; self.wait_until_idle(); @@ -258,16 +256,14 @@ where } fn update_frame(&mut self, spi: &mut SPI, buffer: &[u8]) -> Result<(), SPI::Error> { - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface.data(spi, &buffer)?; // Clear the chromatic layer let color = self.color.get_byte_value(); - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data_x_times(spi, color, NUM_DISPLAY_BITS)?; self.wait_until_idle(); @@ -306,14 +302,12 @@ where let color = DEFAULT_BACKGROUND_COLOR.get_byte_value(); // Clear the black - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface.data_x_times(spi, color, NUM_DISPLAY_BITS)?; // Clear the chromatic - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data_x_times(spi, color, NUM_DISPLAY_BITS)?; self.wait_until_idle(); diff --git a/src/epd4in2/mod.rs b/src/epd4in2/mod.rs index 73e46e0..4e155a5 100644 --- a/src/epd4in2/mod.rs +++ b/src/epd4in2/mod.rs @@ -211,8 +211,7 @@ where self.wait_until_idle(); let color_value = self.color.get_byte_value(); - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface .data_x_times(spi, color_value, WIDTH / 8 * HEIGHT)?; @@ -285,13 +284,11 @@ where let color_value = self.color.get_byte_value(); - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface .data_x_times(spi, color_value, WIDTH / 8 * HEIGHT)?; - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface .data_x_times(spi, color_value, WIDTH / 8 * HEIGHT)?; Ok(()) @@ -450,8 +447,7 @@ where fn update_old_frame(&mut self, spi: &mut SPI, buffer: &[u8]) -> Result<(), SPI::Error> { self.wait_until_idle(); - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface.data(spi, buffer)?; @@ -463,8 +459,7 @@ where self.wait_until_idle(); // self.send_resolution(spi)?; - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data(spi, buffer)?; @@ -492,8 +487,7 @@ where self.shift_display(spi, x, y, width, height)?; - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface.data(spi, buffer)?; @@ -519,8 +513,7 @@ where self.shift_display(spi, x, y, width, height)?; - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface.data(spi, buffer)?; @@ -546,13 +539,11 @@ where self.shift_display(spi, x, y, width, height)?; - self.interface - .cmd(spi, Command::DataStartTransmission1)?; + self.interface.cmd(spi, Command::DataStartTransmission1)?; self.interface .data_x_times(spi, color_value, width / 8 * height)?; - self.interface - .cmd(spi, Command::DataStartTransmission2)?; + self.interface.cmd(spi, Command::DataStartTransmission2)?; self.interface .data_x_times(spi, color_value, width / 8 * height)?;