ledmatrix: Display random startup animation

JohnAZoidberg · JohnAZoidberg · commit 04636e114a59 · 2023-11-03T10:40:33.000+02:00
Signed-off-by: Daniel Schaefer &lt;dhs@frame.work&gt;
diff --git a/fl16-inputmodules/src/animations.rs b/fl16-inputmodules/src/animations.rs
@@ -9,6 +9,25 @@ use crate::patterns::*;
 // - [ ] Each one has a number of frames
 // - [ ] Each one might have a different frame-rate
 
+pub enum Animation {
+    ZigZag(ZigZagIterator),
+    Gof(GameOfLifeIterator),
+    Percentage(StartupPercentageIterator),
+    Breathing(BreathingIterator),
+}
+impl Iterator for Animation {
+    type Item = Grid;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            Animation::ZigZag(x) => x.next(),
+            Animation::Gof(x) => x.next(),
+            Animation::Percentage(x) => x.next(),
+            Animation::Breathing(x) => x.next(),
+        }
+    }
+}
+
 pub struct ZigZagIterator {
     frames: usize,
     current_frame: usize,
diff --git a/fl16-inputmodules/src/matrix.rs b/fl16-inputmodules/src/matrix.rs
@@ -47,11 +47,7 @@ pub struct LedmatrixState {
     /// - Sleep/wake transition is instant, no animation/fading
     /// - No automatic sleeping
     pub debug_mode: bool,
-    //pub upcoming_frames: dyn Iterator<Item = Grid>,
-    //pub upcoming_frames: Option<ZigZagIterator>,
-    //pub upcoming_frames: Option<StartupPercentageIterator>,
-    //pub upcoming_frames: Option<GameOfLifeIterator>,
-    pub upcoming_frames: Option<BreathingIterator>,
+    pub upcoming_frames: Option<Animation>,
 }
 
 #[allow(clippy::large_enum_variant)]
diff --git a/ledmatrix/src/main.rs b/ledmatrix/src/main.rs
@@ -235,13 +235,18 @@ fn main() -> ! {
         animation_period: 31_250, // 31,250 us = 32 FPS
         pwm_freq: PwmFreqArg::P29k,
         debug_mode: false,
-        //upcoming_frames: Some(StartupPercentageIterator::new()),
-        //upcoming_frames: Some(ZigZagIterator::new(34)),
-        //upcoming_frames: Some(GameOfLifeIterator::new(GameOfLifeStartParam::Glider, 60)),
-        upcoming_frames: Some(BreathingIterator::new(64)),
+        upcoming_frames: None,
     };
     state.debug_mode = dip1.is_low().unwrap();
-    if !show_startup_animation(&state) {
+    if show_startup_animation(&state) {
+        state.upcoming_frames = Some(match get_random_byte(&rosc) % 4 {
+            0 => Animation::Percentage(StartupPercentageIterator::new()),
+            1 => Animation::ZigZag(ZigZagIterator::new(34)),
+            2 => Animation::Gof(GameOfLifeIterator::new(GameOfLifeStartParam::Glider, 60)),
+            3 => Animation::Breathing(BreathingIterator::new(64)),
+            _ => unreachable!(),
+        });
+    } else {
         // If no startup animation, render another pattern
         // Lighting up every second column is a good pattern to test for noise.
         state.grid = every_nth_col(2);
