ledmatrix: Default to every 2nd col if no animation

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

fl16-inputmodules/src/patterns.rs

@@ -359,3 +359,17 @@ pub fn zigzag() -> Grid {
 
     grid
 }
+
+pub fn every_nth_col(n: usize) -> Grid {
+    let mut grid = Grid::default();
+
+    for y in 0..HEIGHT {
+        for x in 0..WIDTH {
+            if x % n == 0 {
+                grid.0[x][y] = 0xFF;
+            }
+        }
+    }
+
+    grid
+}

ledmatrix/src/main.rs

@@ -215,6 +215,18 @@ fn main() -> ! {
         &clocks.peripheral_clock,
     );
 
+    // Detect whether the dip1 pin is connected
+    // We switched from bootsel button to DIP-switch with general purpose DIP1 pin in DVT2
+    let mut dip1_present = false;
+    let dip1 = pins.dip1.into_pull_up_input();
+    if dip1.is_low().unwrap() {
+        dip1_present = true;
+    }
+    let dip1 = dip1.into_pull_down_input();
+    if dip1.is_high().unwrap() {
+        dip1_present = true;
+    }
+
     let mut state = LedmatrixState {
         grid: percentage(0),
         col_buffer: Grid::default(),
@@ -226,6 +238,14 @@ fn main() -> ! {
         pwm_freq: PwmFreqArg::P29k,
         debug_mode: false,
     };
+    if dip1_present {
+        state.debug_mode = dip1.is_high().unwrap();
+    }
+    if !show_startup_animation(&state) {
+        // 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);
+    };
 
     let mut matrix = LedMatrix::configure(i2c);
     matrix
@@ -246,9 +266,6 @@ fn main() -> ! {
     let mut sleep_timer = timer.get_counter().ticks();
 
     let mut startup_percentage = Some(0);
-    if !STARTUP_ANIMATION || state.debug_mode {
-        state.grid = percentage(100);
-    }
 
     // Detect whether the sleep pin is connected
     // Early revisions of the hardware didn't have it wired up, if that is the
@@ -263,18 +280,6 @@ fn main() -> ! {
         sleep_present = true;
     }
 
-    // Detect whether the dip1 pin is connected
-    // We switched from bootsel button to DIP-switch with general purpose DIP1 pin in DVT2
-    let mut dip1_present = false;
-    let dip1 = pins.dip1.into_pull_up_input();
-    if dip1.is_low().unwrap() {
-        dip1_present = true;
-    }
-    let dip1 = dip1.into_pull_down_input();
-    if sleep.is_high().unwrap() {
-        dip1_present = true;
-    }
-
     let mut usb_initialized = false;
     let mut usb_suspended = false;
     let mut last_usb_suspended = usb_suspended;
@@ -342,7 +347,7 @@ fn main() -> ! {
         if matches!(state.sleeping, SleepState::Awake) && render_again {
             // On startup slowly turn the screen on - it's a pretty effect :)
             match startup_percentage {
-                Some(p) if p <= 100 && (STARTUP_ANIMATION || state.debug_mode) => {
+                Some(p) if p <= 100 && show_startup_animation(&state) => {
                     state.grid = percentage(p);
                     startup_percentage = Some(p + 5);
                 }
@@ -520,14 +525,23 @@ fn get_random_byte(rosc: &RingOscillator<Enabled>) -> u8 {
     byte
 }
 
-fn dyn_sleep_mode(state: &mut LedmatrixState) -> SleepMode {
+fn dyn_sleep_mode(state: &LedmatrixState) -> SleepMode {
     if state.debug_mode {
         SleepMode::Debug
     } else {
         SLEEP_MODE
     }
 }
 
+fn debug_mode(state: &LedmatrixState) -> bool {
+    dyn_sleep_mode(state) == SleepMode::Debug
+}
+
+fn show_startup_animation(state: &LedmatrixState) -> bool {
+    // Show startup animation
+    STARTUP_ANIMATION && !debug_mode(state)
+}
+
 // Will do nothing if already in the right state
 fn handle_sleep(
     sleep_reason: Option<SleepReason>,
@@ -554,7 +568,7 @@ fn handle_sleep(
             }
 
             // Turn LED controller off to save power
-            if dyn_sleep_mode(state) == SleepMode::Debug {
+            if debug_mode(state) {
                 state.grid = display_sleep_reason(sleep_reason);
                 fill_grid_pixels(state, matrix);
             } else {
@@ -572,7 +586,7 @@ fn handle_sleep(
             fill_grid_pixels(state, matrix);
 
             // Power LED controller back on
-            if dyn_sleep_mode(state) != SleepMode::Debug {
+            if debug_mode(state) {
                 led_enable.set_high().unwrap();
             }