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

Merge pull request #5 from flaminggoat/master

Browse source 
Digital v2 output pin, corrected embedded-graphics endianness
This commit is contained in:
Yuri Iozzelli 2019-12-19 09:44:47 +01:00 committed by GitHub
commit 26933b663c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/lib.rs
View file

@ -7,7 +7,7 @@ extern crate embedded_graphics;
use hal::blocking::delay::DelayMs; use hal::blocking::delay::DelayMs;
use hal::blocking::spi; use hal::blocking::spi;
use hal::digital::OutputPin; use hal::digital::v2::OutputPin;
use hal::spi::{Mode, Phase, Polarity}; use hal::spi::{Mode, Phase, Polarity};
use core::fmt::Debug; use core::fmt::Debug;
@ -23,8 +23,9 @@ const WIDTH: usize = 240;
const HEIGHT: usize = 320; const HEIGHT: usize = 320;
#[derive(Debug)] #[derive(Debug)]
pub enum Error<E> { pub enum Error<SpiE, PinE> {
Spi(E), Spi(SpiE),
OutputPin(PinE)
} }
/// The default orientation is Portrait /// The default orientation is Portrait
@ -60,20 +61,21 @@ pub struct Ili9341<SPI, CS, DC, RESET> {
height: usize, height: usize,
} }
impl<E, SPI, CS, DC, RESET> Ili9341<SPI, CS, DC, RESET> impl<SpiE, PinE, SPI, CS, DC, RESET> Ili9341<SPI, CS, DC, RESET>
where where
SPI: spi::Transfer<u8, Error = E> + spi::Write<u8, Error = E>, SPI: spi::Transfer<u8, Error = SpiE> + spi::Write<u8, Error = SpiE>,
CS: OutputPin, CS: OutputPin<Error = PinE>,
DC: OutputPin, DC: OutputPin<Error = PinE>,
RESET: OutputPin, RESET: OutputPin<Error = PinE>,
{ {
pub fn new<DELAY: DelayMs<u16>>( pub fn new<DELAY: DelayMs<u16>>(
spi: SPI, spi: SPI,
cs: CS, cs: CS,
dc: DC, dc: DC,
reset: RESET, reset: RESET,
delay: &mut DELAY, delay: &mut DELAY,
) -> Result<Self, Error<E>> { ) -> Result<Self, Error<SpiE, PinE>> {
let mut ili9341 = Ili9341 { let mut ili9341 = Ili9341 {
spi, spi,
cs, cs,
@ -83,7 +85,7 @@ where
height: HEIGHT, height: HEIGHT,
}; };
ili9341.hard_reset(delay); ili9341.hard_reset(delay)?;
ili9341.command(Command::SoftwareReset, &[])?; ili9341.command(Command::SoftwareReset, &[])?;
delay.delay_ms(200); delay.delay_ms(200);
@ -124,62 +126,63 @@ where
Ok(ili9341) Ok(ili9341)
} }
fn hard_reset<DELAY: DelayMs<u16>>(&mut self, delay: &mut DELAY) { fn hard_reset<DELAY: DelayMs<u16>>(&mut self, delay: &mut DELAY) -> Result<(), Error<SpiE,PinE>> {
// set high if previously low // set high if previously low
self.reset.set_high(); self.reset.set_high().map_err(Error::OutputPin)?;
delay.delay_ms(200); delay.delay_ms(200);
// set low for reset // set low for reset
self.reset.set_low(); self.reset.set_low().map_err(Error::OutputPin)?;
delay.delay_ms(200); delay.delay_ms(200);
// set high for normal operation // set high for normal operation
self.reset.set_high(); self.reset.set_high().map_err(Error::OutputPin)?;
delay.delay_ms(200); delay.delay_ms(200);
}
fn command(&mut self, cmd: Command, args: &[u8]) -> Result<(), Error<E>> {
self.cs.set_low();
self.dc.set_low();
self.spi.write(&[cmd as u8]).map_err(Error::Spi)?;
self.dc.set_high();
self.spi.write(args).map_err(Error::Spi)?;
self.cs.set_high();
Ok(()) Ok(())
} }
fn write_iter<I: IntoIterator<Item = u16>>(&mut self, data: I) -> Result<(), Error<E>> { fn command(&mut self, cmd: Command, args: &[u8]) -> Result<(), Error<SpiE, PinE>> {
self.cs.set_low(); self.cs.set_low().map_err(Error::OutputPin)?;
self.dc.set_low(); self.dc.set_low().map_err(Error::OutputPin)?;
self.spi.write(&[cmd as u8]).map_err(Error::Spi)?;
self.dc.set_high().map_err(Error::OutputPin)?;
self.spi.write(args).map_err(Error::Spi)?;
self.cs.set_high().map_err(Error::OutputPin)?;
Ok(())
}
fn write_iter<I: IntoIterator<Item = u16>>(&mut self, data: I) -> Result<(), Error<SpiE, PinE>> {
self.cs.set_low().map_err(Error::OutputPin)?;
self.dc.set_low().map_err(Error::OutputPin)?;
self.spi self.spi
.write(&[Command::MemoryWrite as u8]) .write(&[Command::MemoryWrite as u8])
.map_err(Error::Spi)?; .map_err(Error::Spi)?;
self.dc.set_high(); self.dc.set_high().map_err(Error::OutputPin)?;
for d in data.into_iter() { for d in data.into_iter() {
self.spi self.spi
.write(&[(d >> 8) as u8, (d & 0xff) as u8]) .write(&[(d >> 8) as u8, (d & 0xff) as u8])
.map_err(Error::Spi)?; .map_err(Error::Spi)?;
} }
self.cs.set_high(); self.cs.set_high().map_err(Error::OutputPin)?;
Ok(()) Ok(())
} }
fn write_raw(&mut self, data: &[u8]) -> Result<(), Error<E>> { fn write_raw(&mut self, data: &[u8]) -> Result<(), Error<SpiE, PinE>> {
self.cs.set_low(); self.cs.set_low().map_err(Error::OutputPin)?;
self.dc.set_low(); self.dc.set_low().map_err(Error::OutputPin)?;
self.spi self.spi
.write(&[Command::MemoryWrite as u8]) .write(&[Command::MemoryWrite as u8])
.map_err(Error::Spi)?; .map_err(Error::Spi)?;
self.dc.set_high(); self.dc.set_high().map_err(Error::OutputPin)?;
self.spi.write(data).map_err(Error::Spi)?; self.spi.write(data).map_err(Error::Spi)?;
self.cs.set_high(); self.cs.set_high().map_err(Error::OutputPin)?;
Ok(()) Ok(())
} }
fn set_window(&mut self, x0: u16, y0: u16, x1: u16, y1: u16) -> Result<(), Error<E>> { fn set_window(&mut self, x0: u16, y0: u16, x1: u16, y1: u16) -> Result<(), Error<SpiE, PinE>> {
self.command( self.command(
Command::ColumnAddressSet, Command::ColumnAddressSet,
&[ &[
@ -216,7 +219,7 @@ where
x1: u16, x1: u16,
y1: u16, y1: u16,
data: I, data: I,
) -> Result<(), Error<E>> { ) -> Result<(), Error<SpiE, PinE>> {
self.set_window(x0, y0, x1, y1)?; self.set_window(x0, y0, x1, y1)?;
self.write_iter(data) self.write_iter(data)
} }
@ -237,12 +240,12 @@ where
x1: u16, x1: u16,
y1: u16, y1: u16,
data: &[u8], data: &[u8],
) -> Result<(), Error<E>> { ) -> Result<(), Error<SpiE, PinE>> {
self.set_window(x0, y0, x1, y1)?; self.set_window(x0, y0, x1, y1)?;
self.write_raw(data) self.write_raw(data)
} }
/// Change the orientation of the screen /// Change the orientation of the screen
pub fn set_orientation(&mut self, mode: Orientation) -> Result<(), Error<E>> { pub fn set_orientation(&mut self, mode: Orientation) -> Result<(), Error<SpiE, PinE>> {
match mode { match mode {
Orientation::Portrait => { Orientation::Portrait => {
self.width = WIDTH; self.width = WIDTH;
@ -282,14 +285,16 @@ use embedded_graphics::drawable;
use embedded_graphics::{drawable::Pixel, pixelcolor::Rgb565, Drawing}; use embedded_graphics::{drawable::Pixel, pixelcolor::Rgb565, Drawing};
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
impl<E, SPI, CS, DC, RESET> Drawing<Rgb565> for Ili9341<SPI, CS, DC, RESET> impl<SpiE, PinE, SPI, CS, DC, RESET> Drawing<Rgb565> for Ili9341<SPI, CS, DC, RESET>
where where
SPI: spi::Transfer<u8, Error = E> + spi::Write<u8, Error = E>, SPI: spi::Transfer<u8, Error = SpiE> + spi::Write<u8, Error = SpiE>,
CS: OutputPin, CS: OutputPin<Error = PinE>,
DC: OutputPin, DC: OutputPin<Error = PinE>,
RESET: OutputPin, RESET: OutputPin<Error = PinE>,
E: Debug, SpiE: Debug,
PinE: Debug,
{ {
fn draw<T>(&mut self, item_pixels: T) fn draw<T>(&mut self, item_pixels: T)
where where
T: IntoIterator<Item = drawable::Pixel<Rgb565>>, T: IntoIterator<Item = drawable::Pixel<Rgb565>>,
@ -304,7 +309,7 @@ where
pos.y as u16, pos.y as u16,
&embedded_graphics::pixelcolor::raw::RawU16::from(color) &embedded_graphics::pixelcolor::raw::RawU16::from(color)
.into_inner() .into_inner()
.to_le_bytes(), .to_be_bytes(),
) )
.expect("Failed to communicate with device"); .expect("Failed to communicate with device");
} }