display: More drawing code.

display/firmware/Cargo.lock

@@ -400,12 +400,12 @@ dependencies = [
 [[package]]
 name = "tinygfx"
 version = "0.1.0"
-source = "git+https://github.com/mgottschlag/tinygfx#9dd1ff4155b47048bce4c7ed49c87c98e8d91b3b"
+source = "git+https://github.com/mgottschlag/tinygfx#6560a8e340ce288b9d3be0fad4933a9e22a74417"
 
 [[package]]
 name = "tinygfx-assets"
 version = "0.1.0"
-source = "git+https://github.com/mgottschlag/tinygfx#9dd1ff4155b47048bce4c7ed49c87c98e8d91b3b"
+source = "git+https://github.com/mgottschlag/tinygfx#6560a8e340ce288b9d3be0fad4933a9e22a74417"
 dependencies = [
  "freetype-rs 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lodepng 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",

display/firmware/src/display.rs

@@ -1,8 +1,12 @@
 use embedded_hal::blocking::delay::DelayUs;
 use embedded_hal::digital::v2::OutputPin;
-use epd_waveshare::{epd4in2::*, prelude::*};
+use epd_waveshare::epd4in2::EPD4in2;
+use epd_waveshare::prelude::{DisplayStream, WaveshareDisplay};
 use mkl25z4_hal::time::CopyableMonoTimer;
+use tinygfx::color::BlackWhite::{self, Black, White};
+use tinygfx::{Frame, Rectangle, Renderer, Text};
 
+use super::assets::ROBOTO_30;
 use super::information::Information;
 use super::pins::{
     DisplayBmeSpi, DisplayBusy, DisplayCs, DisplayDc, DisplayPins, DisplayPwr, DisplayRst,
@@ -63,8 +67,18 @@ impl Display {
         self.epd.wake_up(spi, &mut time).ok();
 
         // TODO: Draw the display contents.
-        self.epd.set_background_color(Color::Black);
-        let checkerboard = Checkerboard::new(400, 300, true);
+        let r = Rectangle::new(10, 10, 100, 50, Black);
+        let t = Text::new(20, 100, "asdf", &ROBOTO_30, Black);
+        let mut frame = Frame::new(400, 300, |mut renderer| {
+            let clip = renderer.full_frame();
+            renderer.clear(White);
+            r.draw(clip, &mut renderer);
+            t.draw(clip, &mut renderer);
+        });
+        frame.mirror_x(true);
+        frame.mirror_y(true);
+        //self.epd.set_background_color(Color::Black);
+        let checkerboard = TinyGfxStream::new(frame);
         self.epd.update_frame_stream(spi, checkerboard).unwrap();
         self.epd.display_frame(spi).unwrap();
 
@@ -73,34 +87,36 @@ impl Display {
     }
 }
 
-struct Checkerboard {
-    width: usize,
-    height: usize,
-    index: usize,
-    buffer: [u8; 1],
+struct TinyGfxStream<Draw> {
+    frame: Frame<Draw, BlackWhite>,
+    buffer: [u8; 400 / 8],
+    row: u32,
 }
 
-impl Checkerboard {
-    fn new(width: usize, height: usize, start_black: bool) -> Self {
+impl<Draw> TinyGfxStream<Draw>
+where
+    Draw: Fn(Renderer<BlackWhite>),
+{
+    fn new(frame: Frame<Draw, BlackWhite>) -> Self {
         Self {
-            width: width / 8,
-            height,
-            index: 0,
-            buffer: [if start_black { 0x55 } else { 0xaa }],
+            frame,
+            buffer: [0u8; 400 / 8],
+            row: 0,
         }
     }
 }
 
-impl DisplayStream for Checkerboard {
+impl<Draw> DisplayStream for TinyGfxStream<Draw>
+where
+    Draw: Fn(Renderer<BlackWhite>),
+{
     fn next<'a>(&'a mut self) -> Option<&'a [u8]> {
-        if self.index != self.width * self.height {
-            self.index += 1;
-            if (self.index - 1) % self.width == 0 {
-                self.buffer[0] = !self.buffer[0];
-            }
-            Some(&self.buffer)
-        } else {
+        if self.row == self.frame.height() {
             None
+        } else {
+            self.frame.draw_row(self.row, &mut self.buffer);
+            self.row += 1;
+            Some(&self.buffer)
         }
     }
 }