Skip to content

Commit

Permalink
Merge pull request #1269 from proudmuslim-dev/patch-3
Browse files Browse the repository at this point in the history
Fix typos in code for `embedded_graphics` crate in chapter 3
  • Loading branch information
phil-opp authored Jan 28, 2024
2 parents 916ad36 + c9683a2 commit 2cf0675
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions blog/content/edition-3/posts/03-screen-output/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,22 +312,24 @@ Fortunately, there is the nice `no_std`-compatible [`embedded-graphics`] crate,

```rust ,hl_lines=3
// in kernel/src/framebuffer.rs
use embedded_graphics::pixelcolor::Rgb888;

pub struct Display {
framebuffer: Framebuffer,
framebuffer: FrameBuffer,
}

impl Display {
pub fn new(framebuffer: Framebuffer) -> Display {
pub fn new(framebuffer: FrameBuffer) -> Display {
Self { framebuffer }
}

fn draw_pixel(&mut self, pixel: Pixel) {
fn draw_pixel(&mut self, Pixel(coordinates, color): Pixel<Rgb888>) {
// ignore any pixels that are out of bounds.
let (width, height) = {
let info = self.framebuffer.info();
(info.width, info.height)
}

if let Ok((x @ 0..width, y @ 0..height)) = coordinates.try_into() {
let color = Color { red: color.r(), green: color.g(), blue: color.b()};
set_pixel_in(&mut self.framebuffer, Position { x, y }, color);
Expand All @@ -336,7 +338,7 @@ impl Display {
}

impl embedded_graphics::draw_target::DrawTarget for Display {
type Color = embedded_graphics::pixelcolor::Rgb888;
type Color = Rgb888;

/// Drawing operations can never fail.
type Error = core::convert::Infallible;
Expand All @@ -345,9 +347,10 @@ impl embedded_graphics::draw_target::DrawTarget for Display {
where
I: IntoIterator<Item = Pixel<Self::Color>>,
{
for Pixel(coordinates, color) in pixels.into_iter() {
for pixel in pixels.into_iter() {
self.draw_pixel(pixel);
}

Ok(())
}
}
Expand Down

0 comments on commit 2cf0675

Please sign in to comment.