mirrors/ili9341-rs
1
0
Fork 0
mirror of https://github.com/yuri91/ili9341-rs.git synced 2024-11-21 22:30:59 +00:00
Code Issues Projects Releases Wiki Activity

Use u16 for pixel data

Browse source
This commit is contained in:
Vadim Kaushan 2020-01-28 20:35:30 +03:00
parent 459545a777
commit 11c4a5ca34
No known key found for this signature in database
GPG key ID: A501C5DF67C05C4E
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/lib.rs
View file

@ -186,10 +186,6 @@ impl<IfaceE, PinE, IFACE, RESET> Ili9341<IFACE, RESET>
self.interface.write_iter(Command::MemoryWrite as u8, data) self.interface.write_iter(Command::MemoryWrite as u8, data)
} }
fn write_raw(&mut self, data: &[u8]) -> Result<(), IFACE::Error> {
self.interface.write(Command::MemoryWrite as u8, data)
}
fn set_window(&mut self, x0: u16, y0: u16, x1: u16, y1: u16) -> Result<(), IFACE::Error> { fn set_window(&mut self, x0: u16, y0: u16, x1: u16, y1: u16) -> Result<(), IFACE::Error> {
self.command( self.command(
Command::ColumnAddressSet, Command::ColumnAddressSet,
@ -238,21 +234,20 @@ impl<IfaceE, PinE, IFACE, RESET> Ili9341<IFACE, RESET>
/// ///
/// The border is included. /// The border is included.
/// ///
/// This method accepts a raw buffer of bytes that will be copied to the screen /// This method accepts a raw buffer of words that will be copied to the screen
/// video memory. /// video memory.
/// ///
/// The expected format is rgb565, and the two bytes for a pixel /// The expected format is rgb565.
/// are in big endian order.
pub fn draw_raw( pub fn draw_raw(
&mut self, &mut self,
x0: u16, x0: u16,
y0: u16, y0: u16,
x1: u16, x1: u16,
y1: u16, y1: u16,
data: &[u8], data: &[u16],
) -> Result<(), IFACE::Error> { ) -> Result<(), IFACE::Error> {
self.set_window(x0, y0, x1, y1)?; self.set_window(x0, y0, x1, y1)?;
self.write_raw(data) self.write_iter(data.iter().cloned())
} }
/// Change the orientation of the screen /// Change the orientation of the screen
@ -311,7 +306,7 @@ where
{ {
const BUF_SIZE: usize = 64; const BUF_SIZE: usize = 64;
let mut row: [u8; BUF_SIZE] = [0; BUF_SIZE]; let mut row: [u16; BUF_SIZE] = [0; BUF_SIZE];
let mut i = 0; let mut i = 0;
let mut lasty = 0; let mut lasty = 0;
let mut startx = 0; let mut startx = 0;
@ -333,14 +328,8 @@ where
startx = pos.x; startx = pos.x;
} }
// Add pixel color to buffer // Add pixel color to buffer
for b in embedded_graphics::pixelcolor::raw::RawU16::from(color) row[i] = embedded_graphics::pixelcolor::raw::RawU16::from(color).into_inner();
.into_inner() i += 1;
.to_be_bytes()
.iter()
{
row[i] = *b;
i += 1;
}
lasty = pos.y; lasty = pos.y;
endx = pos.x; endx = pos.x;
} else { } else {
@ -357,14 +346,8 @@ where
// Start new line of contiguous pixels // Start new line of contiguous pixels
i = 0; i = 0;
startx = pos.x; startx = pos.x;
for b in embedded_graphics::pixelcolor::raw::RawU16::from(color) row[i] = embedded_graphics::pixelcolor::raw::RawU16::from(color).into_inner();
.into_inner() i += 1;
.to_be_bytes()
.iter()
{
row[i] = *b;
i += 1;
}
lasty = pos.y; lasty = pos.y;
endx = pos.x; endx = pos.x;
} }