src: rewrite display to have generic surface implementations

src/main.rs

@@ -1,13 +1,12 @@
 #![feature(trait_upcasting)]
 #![allow(arithmetic_overflow)]
 use esp_idf_svc::hal::prelude::Peripherals;
-use ws2812_esp32_rmt_driver::lib_embedded_graphics::{LedPixelStrip, LedPixelShape, LedPixelMatrix, Ws2812DrawTarget};
+use ws2812_esp32_rmt_driver::lib_embedded_graphics::{LedPixelShape, Ws2812DrawTarget};
 use embedded_graphics::{
     prelude::*,
 };
 use palette::Hsv;
 use palette::convert::IntoColorUnclamped;
-use std::thread;
 
 mod power;
 mod lib8;
@@ -20,10 +19,11 @@ mod embedded_graphics_lib;
 use crate::time::Periodically;
 use crate::geometry::{Coordinates, VirtualCoordinates};
 use crate::embedded_graphics_lib::EmbeddedDisplay;
+use crate::render::{Surfaces, Surface, SimpleSurface};
 
-struct IdleTask {
+struct IdleTask<T: Surface> {
     frame: u8,
-    surface: render::Surface,
+    surface: T,
     updater: Periodically
 }
 
@@ -37,17 +37,17 @@ impl render::Shader for IdleShader {
     }
 }
 
-impl IdleTask {
-    fn new(render: &mut dyn render::Display) -> Self {
+impl<T: Surface> IdleTask<T> {
+    fn new(surface: T) -> Self {
         IdleTask {
             frame: 0,
-            surface: render.new_surface(),
+            surface: surface,
             updater: Periodically::new_every_n_ms(16)
         }
     }
 }
 
-impl task::Task for IdleTask {
+impl<T: Surface> task::Task for IdleTask<T> {
     fn name(&self) -> &'static str { "Idle" }
 
     fn tick(&mut self) {
@@ -82,6 +82,8 @@ impl LedPixelShape for PonderjarMatrix {
     }
 }
 
+type PonderjarTarget<'a> = Ws2812DrawTarget<'a, PonderjarMatrix>;
+
 fn main() {
     // It is necessary to call this function once. Otherwise some patches to the runtime
     // implemented by esp-idf-sys might not link properly. See https://github.com/esp-rs/esp-idf-template/issues/71
@@ -96,19 +98,17 @@ fn main() {
     let led_pin = peripherals.pins.gpio14;
     let channel = peripherals.rmt.channel0;
 
-    const NUM_PIXELS : usize = 255;
     const POWER_VOLTS : u32 = 5;
     const POWER_MA : u32 = 500;
     const MAX_POWER_MW : u32 = POWER_VOLTS * POWER_MA;
 
     log::info!("Setting up display");
-    let mut target = Ws2812DrawTarget::<PonderjarMatrix>::new(channel, led_pin).unwrap();
-    target.set_brightness(0);
-    let mut display = EmbeddedDisplay::new(target, MAX_POWER_MW);
+    let target = PonderjarTarget::new(channel, led_pin).unwrap();
+    let mut display = EmbeddedDisplay::<PonderjarTarget, SimpleSurface>::new(target, MAX_POWER_MW);
 
     log::info!("Creating runner");
     let mut runner = task::Scheduler::new(vec![
-        Box::new(IdleTask::new(&mut display)),
+        Box::new(IdleTask::new(display.new_surface().unwrap())),
         Box::new(display),
     ]);