Merge pull request #28 from yuri91/embedded-graphics-0.7

Embedded graphics 0.7
This commit is contained in:
Yuri Iozzelli 2021-06-10 18:39:42 +02:00 committed by GitHub
commit 634558b18e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 102 deletions

View file

@ -12,11 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
display-interface = "0.4.1" display-interface = "0.4.1"
embedded-hal = "0.2.4" embedded-hal = "0.2.5"
[dependencies.embedded-graphics]
optional = true
version = "0.6.2"
[dependencies.embedded-graphics-core] [dependencies.embedded-graphics-core]
optional = true optional = true
@ -25,6 +21,5 @@ version = "0.3"
[features] [features]
default = ["graphics"] default = ["graphics"]
graphics = ["embedded-graphics"] graphics = ["embedded-graphics-core"]
graphics-core = ["embedded-graphics-core"]

View file

@ -1,92 +0,0 @@
use crate::Ili9341;
use core::iter;
use embedded_graphics::{
drawable::Pixel,
geometry::{Point, Size},
pixelcolor::{
raw::{RawData, RawU16},
Rgb565,
},
primitives::Rectangle,
style::{PrimitiveStyle, Styled},
DrawTarget,
};
impl<IFACE, RESET> DrawTarget<Rgb565> for Ili9341<IFACE, RESET>
where
IFACE: display_interface::WriteOnlyDataCommand,
{
type Error = display_interface::DisplayError;
fn size(&self) -> Size {
Size::new(self.width as u32, self.height as u32)
}
fn draw_pixel(&mut self, pixel: Pixel<Rgb565>) -> Result<(), Self::Error> {
let Pixel(pos, color) = pixel;
if pos.x < 0 || pos.y < 0 || pos.x >= self.width as i32 || pos.y >= self.height as i32 {
return Ok(());
}
self.draw_raw_slice(
pos.x as u16,
pos.y as u16,
pos.x as u16,
pos.y as u16,
&[RawU16::from(color).into_inner()],
)
}
fn draw_rectangle(
&mut self,
item: &Styled<Rectangle, PrimitiveStyle<Rgb565>>,
) -> Result<(), Self::Error> {
let Point { x: x0, y: y0 } = item.primitive.top_left;
let Point { x: x1, y: y1 } = item.primitive.bottom_right;
let w = self.width as i32;
let h = self.height as i32;
if x0 >= w || y0 >= h {
return Ok(());
}
fn clamp(v: i32, max: i32) -> u16 {
if v < 0 {
0
} else if v > max {
max as u16
} else {
v as u16
}
}
let x0 = clamp(x0, w - 1);
let y0 = clamp(y0, h - 1);
let x1 = clamp(x1, w - 1);
let y1 = clamp(y1, h - 1);
self.draw_raw_iter(
x0,
y0,
x1,
y1,
item.into_iter()
.filter(|p| {
let Point { x, y } = p.0;
x >= 0 && y >= 0 && x < w && y < h
})
.map(|p| RawU16::from(p.1).into_inner()),
)
}
fn clear(&mut self, color: Rgb565) -> Result<(), Self::Error> {
let color = RawU16::from(color).into_inner();
self.draw_raw_iter(
0,
0,
(self.width - 1) as u16,
(self.height - 1) as u16,
iter::repeat(color).take(self.width * self.height),
)
}
}

View file

@ -8,9 +8,6 @@ use display_interface::DataFormat::{U16BEIter, U8Iter};
use display_interface::WriteOnlyDataCommand; use display_interface::WriteOnlyDataCommand;
#[cfg(feature = "graphics")] #[cfg(feature = "graphics")]
mod graphics;
#[cfg(feature = "graphics-core")]
mod graphics_core; mod graphics_core;
pub use embedded_hal::spi::MODE_0 as SPI_MODE; pub use embedded_hal::spi::MODE_0 as SPI_MODE;