Merge pull request #82 from DavJCosby/proc-macros

exposed .leds() in driver, pass by reference instead of clone
DavJCosby · Sep 28, 2024 · 88841ce · 88841ce
2 parents b59922c + e4f200a
commit 88841ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/driver/mod.rs b/src/driver/mod.rs
@@ -1,6 +1,6 @@
 use crate::{
     color::{Rgb, Srgb},
-    Sled, SledError, Vec2,
+    Led, Sled, SledError, Vec2,
 };
 
 use std::time::{Duration, Instant};
@@ -118,7 +118,15 @@ impl Driver {
         self.sled.take().unwrap()
     }
 
-    pub fn colors(&self) -> impl Iterator<Item = Rgb> + '_ {
+    pub fn leds(&self) -> impl Iterator<Item = &Led> {
+        if let Some(sled) = &self.sled {
+            sled.leds()
+        } else {
+            panic!("Driver has no Sled assigned!")
+        }
+    }
+
+    pub fn colors(&self) -> impl Iterator<Item = &Rgb> + '_ {
         if let Some(sled) = &self.sled {
             sled.colors()
         } else {

diff --git a/src/sled/meta.rs b/src/sled/meta.rs
@@ -119,8 +119,8 @@ impl Sled {
     ///     /*- snip -*/
     /// }
     /// ```
-    pub fn colors(&self) -> impl Iterator<Item = Rgb> + '_ {
-        self.leds.iter().map(|led| led.color)
+    pub fn colors(&self) -> impl Iterator<Item = &Rgb> + '_ {
+        self.leds.iter().map(|led| &led.color)
     }
 
     /// Returns an Iterator over the RGB colors for each [LED](Led) in the system.