feliix42/ssd1675
1
0
Fork 0
mirror of https://github.com/Feliix42/ssd1675.git synced 2024-11-21 10:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #15 from xaep/master

Browse source 
Update embedded_graphics and profont dependencies to latest versions
This commit is contained in:
Wesley Moore 2020-07-20 10:20:13 +10:00 committed by GitHub
commit 024d987517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 102 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -26,7 +26,7 @@ version = "0.2.3"
[dependencies.embedded-graphics]
optional = true
version = "0.5.2"
version = "0.6.2"
[dependencies.linux-embedded-hal]
optional = true
@ -34,7 +34,7 @@ version = "0.3.0"
[dependencies.profont]
optional = true
version = "0.3.0"
version = "0.4.0"
[features]
default = ["graphics"]

93
examples/raspberry_pi_inky_phat.rs
View file

@ -8,10 +8,9 @@ extern crate ssd1675;
use ssd1675::{Builder, Color, Dimensions, Display, GraphicDisplay, Rotation};
// Graphics
#[macro_use]
extern crate embedded_graphics;
use embedded_graphics::coord::Coord;
use embedded_graphics::prelude::*;
use embedded_graphics::Drawing;
// Font
extern crate profont;
@ -117,49 +116,69 @@ fn main() -> Result<(), std::io::Error> {
display.clear(Color::White);
println!("Clear");
display.draw(
ProFont24Point::render_str("Raspberry Pi")
.stroke(Some(Color::Red))
.fill(Some(Color::White))
.translate(Coord::new(1, -4))
.into_iter(),
);
egtext!(
text = "Raspberry Pi",
top_left = (1, -4),
style = text_style!(
font = ProFont24Point,
background_color = Color::White,
text_color = Color::Red,
)
)
.draw(&mut display)
.expect("error drawing text");
if let Ok(cpu_temp) = read_cpu_temp() {
display.draw(
ProFont14Point::render_str("CPU Temp:")
.stroke(Some(Color::Black))
.fill(Some(Color::White))
.translate(Coord::new(1, 30))
.into_iter(),
);
display.draw(
ProFont12Point::render_str(&format!("{:.1}°C", cpu_temp))
.stroke(Some(Color::Black))
.fill(Some(Color::White))
.translate(Coord::new(95, 34))
.into_iter(),
);
egtext!(
text = "CPU Temp:",
top_left = (1, 30),
style = text_style!(
font = ProFont14Point,
background_color = Color::White,
text_color = Color::Black,
)
)
.draw(&mut display)
.expect("error drawing text");
egtext!(
text = &format!("{:.1}°C", cpu_temp),
top_left = (95, 34),
style = text_style!(
font = ProFont12Point,
background_color = Color::White,
text_color = Color::Black,
)
)
.draw(&mut display)
.expect("error drawing text");
}
if let Some(uptime) = read_uptime() {
display.draw(
ProFont9Point::render_str(uptime.trim())
.stroke(Some(Color::Black))
.fill(Some(Color::White))
.translate(Coord::new(1, 93))
.into_iter(),
);
egtext!(
text = uptime.trim(),
top_left = (1, 93),
style = text_style!(
font = ProFont9Point,
background_color = Color::White,
text_color = Color::Black,
)
)
.draw(&mut display)
.expect("error drawing text");
}
if let Some(uname) = read_uname() {
display.draw(
ProFont9Point::render_str(uname.trim())
.stroke(Some(Color::Black))
.fill(Some(Color::White))
.translate(Coord::new(1, 84))
.into_iter(),
);
egtext!(
text = uname.trim(),
top_left = (1, 84),
style = text_style!(
font = ProFont9Point,
background_color = Color::White,
text_color = Color::Black,
)
)
.draw(&mut display)
.expect("error drawing text");
}
display.update(&mut delay).expect("error updating display");

6
src/color.rs
View file

@ -9,9 +9,13 @@ pub enum Color {
#[cfg(feature = "graphics")]
extern crate embedded_graphics;
#[cfg(feature = "graphics")]
use self::embedded_graphics::pixelcolor::raw::RawU8;
#[cfg(feature = "graphics")]
use self::embedded_graphics::prelude::*;
#[cfg(feature = "graphics")]
impl PixelColor for Color {}
impl PixelColor for Color {
type Raw = RawU8;
}
impl From<u8> for Color {
fn from(value: u8) -> Self {

87
src/graphics.rs
View file

@ -124,59 +124,46 @@ fn rotation(x: u32, y: u32, width: u32, height: u32, rotation: Rotation) -> (u32
}
}
fn outside_display(x: u32, y: u32, width: u32, height: u32, rotation: Rotation) -> bool {
match rotation {
Rotation::Rotate0 | Rotation::Rotate180 => {
if x >= width || y >= height {
return true;
}
}
Rotation::Rotate90 | Rotation::Rotate270 => {
if y >= width || x >= height {
return true;
}
}
}
false
}
#[cfg(feature = "graphics")]
extern crate embedded_graphics;
#[cfg(feature = "graphics")]
use self::embedded_graphics::{drawable::Pixel, prelude::UnsignedCoord, Drawing};
use self::embedded_graphics::prelude::*;
#[cfg(feature = "graphics")]
impl<'a, I> Drawing<Color> for GraphicDisplay<'a, I>
impl<'a, I> DrawTarget<Color> for GraphicDisplay<'a, I>
where
I: DisplayInterface,
{
fn draw<T>(&mut self, item_pixels: T)
where
T: IntoIterator<Item = Pixel<Color>>,
{
for Pixel(UnsignedCoord(x, y), colour) in item_pixels {
if outside_display(
x,
y,
self.cols() as u32,
self.rows() as u32,
self.rotation(),
) {
continue;
}
type Error = core::convert::Infallible;
self.set_pixel(x, y, colour);
fn draw_pixel(
&mut self,
Pixel(Point { x, y }, color): Pixel<Color>,
) -> Result<(), Self::Error> {
let sz = self.size();
let x = x as u32;
let y = y as u32;
if x < sz.width && y < sz.height {
self.set_pixel(x, y, color)
}
Ok(())
}
fn size(&self) -> Size {
match self.rotation() {
Rotation::Rotate0 | Rotation::Rotate180 => {
Size::new(self.cols().into(), self.rows().into())
}
Rotation::Rotate90 | Rotation::Rotate270 => {
Size::new(self.rows().into(), self.cols().into())
}
}
}
}
#[cfg(test)]
mod tests {
use self::embedded_graphics::coord::Coord;
use self::embedded_graphics::prelude::*;
use self::embedded_graphics::primitives::Rectangle;
use self::embedded_graphics::Drawing;
use self::embedded_graphics::{egrectangle, primitive_style};
use super::*;
use {Builder, Color, Dimensions, Display, DisplayInterface, GraphicDisplay, Rotation};
@ -278,11 +265,13 @@ mod tests {
let mut display =
GraphicDisplay::new(build_mock_display(), &mut black_buffer, &mut red_buffer);
display.draw(
Rectangle::new(Coord::new(0, 0), Coord::new(2, 2))
.stroke(Some(Color::White))
.into_iter(),
);
egrectangle!(
top_left = (0, 0),
bottom_right = (2, 2),
style = primitive_style!(stroke_color = Color::White, stroke_width = 1)
)
.draw(&mut display)
.unwrap()
}
#[rustfmt::skip]
@ -305,11 +294,13 @@ mod tests {
let mut display =
GraphicDisplay::new(build_mock_display(), &mut black_buffer, &mut red_buffer);
display.draw(
Rectangle::new(Coord::new(0, 0), Coord::new(2, 2))
.stroke(Some(Color::Red))
.into_iter(),
);
egrectangle!(
top_left = (0, 0),
bottom_right = (2, 2),
style = primitive_style!(stroke_color = Color::Red, stroke_width = 1)
)
.draw(&mut display)
.unwrap();
}
#[rustfmt::skip]