render: implement a generic Renderer task that can run any display

src/platform/embedded_graphics_lib.rs

@@ -8,15 +8,13 @@ use ws2812_esp32_rmt_driver::lib_embedded_graphics::{Ws2812DrawTarget, LedPixelS
 
 use esp_idf_svc::hal::prelude::Peripherals;
 
-use running_average::RealTimeRunningAverage;
 use std::io;
+use std::fmt::{Formatter, Debug};
 
 use crate::power;
 use crate::power::AsMilliwatts;
 use crate::lib8::*;
 use crate::render::*;
-use crate::time::Periodically;
-use crate::task::Task;
 use crate::geometry::*;
 use crate::platform::DisplayInit;
 
@@ -28,42 +26,44 @@ S: Surface {
     target: T,
     total_mw: u32,
     max_mw: u32,
-    fps: RealTimeRunningAverage<u32>,
-    frame: u32,
-    fps_display: Periodically
 }
 
-impl<T: LedPixelShape, S: Surface> Task for EmbeddedDisplay<Ws2812DrawTarget<'_, T>, S> {
-    fn start(&mut self) {
-        self.target.set_brightness(0);
-    }
 
-    fn name(&self) -> &'static str { "Renderer" }
-
-    fn tick(&mut self) {
-        self.start_frame();
-        self.render_frame();
-        self.end_frame();
+impl<T: DrawTarget, S: Surface> Debug for EmbeddedDisplay<T, S> {
+    fn fmt(&self, f: &mut Formatter) -> Result<(), std::fmt::Error> {
+        f.debug_struct("EmbeddedDisplay")
+        .field("total_mw", &self.total_mw)
+        .field("surfaces", &self.surfaces)
+        .finish()
     }
 }
 
+trait TargetInit<T: DrawTarget> {
+    fn setup_target(mut target: T) -> T { target }
+}
+
 impl<T, S> EmbeddedDisplay<T, S>
 where
+Self: TargetInit<T>,
 T: DrawTarget,
 S: Surface {
     pub fn new(target: T, max_mw: u32) -> Self {
         EmbeddedDisplay {
             surfaces: SurfacePool::new(),
-            target: target,
+            target: Self::setup_target(target),
             max_mw: max_mw,
             total_mw: 0,
-            fps: RealTimeRunningAverage::default(),
-            frame: 0,
-            fps_display: Periodically::new_every_n_seconds(5)
         }
     }
 }
 
+impl<T: LedPixelShape, S: Surface> TargetInit<Ws2812DrawTarget<'_, T>> for EmbeddedDisplay<Ws2812DrawTarget<'_, T>, S> {
+    fn setup_target(mut target: Ws2812DrawTarget<'_, T>) -> Ws2812DrawTarget<'_, T> {
+        target.set_brightness(0);
+        target
+    }
+}
+
 impl<T, S> Surfaces<S> for EmbeddedDisplay<T, S>
 where
 T: DrawTarget,
@@ -77,17 +77,12 @@ impl<T: LedPixelShape, S: Surface> Display<S> for EmbeddedDisplay<Ws2812DrawTarg
 
     fn start_frame(&mut self) {
         self.total_mw = 0;
-        self.frame = self.frame.wrapping_add(1);
     }
 
     fn end_frame(&mut self) {
         let brightness = power::brightness_for_mw(self.total_mw, 255, self.max_mw);
         self.target.set_brightness(brightness);
         self.target.flush().unwrap();
-        self.fps.insert(1);
-        self.fps_display.run(|| {
-            log::info!("FPS: {} frame={} brightness={} mw={}", self.fps.measurement(), self.frame, brightness, self.total_mw);
-        });
     }
 
     fn render_frame(&mut self) {
@@ -114,7 +109,7 @@ impl<T: LedPixelShape, S: Surface> Display<S> for EmbeddedDisplay<Ws2812DrawTarg
 }
 
 impl<Shape: LedPixelShape> DisplayInit for Ws2812DrawTarget<'_, Shape> {
-    fn new_display<S: Surface>() -> impl Display<S> + Task {
+    fn new_display<S: Surface>() -> impl Display<S> {
         let peripherals = Peripherals::take().unwrap();
         let led_pin = peripherals.pins.gpio14;
         let channel = peripherals.rmt.channel0;