From 24f0a336e634f87826e38332bea0d245b92e545e Mon Sep 17 00:00:00 2001
From: Victoria Fischer <tdfischer@hackerbots.net>
Date: Sat, 16 Nov 2024 12:06:00 +0100
Subject: [PATCH] platform: smart_leds: no need to keep total_mw around when we
 can calculate on the fly

---
 src/platform/smart_leds_lib.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/platform/smart_leds_lib.rs b/src/platform/smart_leds_lib.rs
index 51573a6..08472dc 100644
--- a/src/platform/smart_leds_lib.rs
+++ b/src/platform/smart_leds_lib.rs
@@ -16,14 +16,13 @@ pub struct SmartLedDisplay<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> {
     surfaces : SurfacePool<S>,
     target: T,
     pixbuf: [T::Color; 255],
-    total_mw: u32,
     max_mw: u32
 }
 
 impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> Debug for SmartLedDisplay<T, S> {
     fn fmt(&self, f: &mut Formatter) -> Result<(), std::fmt::Error> {
         f.debug_struct("SmartLedDisplay")
-            .field("total_mw", &self.total_mw)
+            .field("total_mw", &self.pixbuf.as_milliwatts())
             .field("surfaces", &self.surfaces)
             .finish()
     }
@@ -35,7 +34,6 @@ impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> SmartLedDisplay<T, S> {
             surfaces: SurfacePool::new(),
             target: target,
             max_mw: max_mw,
-            total_mw: 0,
             pixbuf: [Rgb::new(0, 0, 0); 255]
         }
     }
@@ -43,7 +41,7 @@ impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> SmartLedDisplay<T, S> {
 
 impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> AsMilliwatts for SmartLedDisplay<T, S> {
     fn as_milliwatts(&self) -> u32 {
-        self.total_mw
+        self.pixbuf.as_milliwatts()
     }
 }
 
@@ -58,11 +56,10 @@ S: Surface {
 
 impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> Display<S> for SmartLedDisplay<T, S> {
     fn start_frame(&mut self) {
-        self.total_mw = 0;
     }
 
     fn end_frame(&mut self) {
-        let b = brightness_for_mw(self.total_mw, 255, self.max_mw);
+        let b = brightness_for_mw(self.pixbuf.as_milliwatts(), 255, self.max_mw);
         let _ = self.target.write(brightness(self.pixbuf.iter().cloned(), b));
     }
 
@@ -75,7 +72,6 @@ impl<T: SmartLedsWrite<Color = Rgb<u8>>, S: Surface> Display<S> for SmartLedDisp
                     pixel = pixel.saturating_add(shader.draw(&virt_coords));
                 })
             }
-            self.total_mw += pixel.as_milliwatts();
             self.pixbuf[x] = Rgb::new(pixel.r, pixel.g, pixel.b);
         };
     }