fix: recognize actual button, not wrong one

src/navigation/navigation.rs

@@ -1,13 +1,12 @@
 use crate::card::model::Card;
+use crate::navigation::inputs::ButtonAction;
 use crate::navigation::state::NavigationState;
 use crate::views::view::View;
 use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
 
-use embassy_futures::select::{Either, Either6, select};
-use embassy_futures::select::select6;
-use embassy_time::{Duration, Timer};
+use embassy_futures::select::{Either, select};
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-
+use embassy_time::{Duration, Timer};
 
 pub type Mutex<T> = embassy_sync::mutex::Mutex<CriticalSectionRawMutex, T>;
 pub type Signal<T> = embassy_sync::signal::Signal<CriticalSectionRawMutex, T>;
@@ -16,12 +15,7 @@ const DEBOUNCE_DURATION_MILLIS: u64 = 100;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Action {
-    Up,
-    Down,
-    Left,
-    Right,
-    Ok,
-    Back,
+    Button(ButtonAction),
     Timer,
 }
 
@@ -40,39 +34,29 @@ pub trait Navigable {
 }
 
 #[embassy_executor::task]
-pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>, ) {
+pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) {
     log::info!("starting navigation");
 
     let mut state = NavigationState::new();
     state.screens.last().unwrap().display(display).await;
 
     loop {
-        let selection_buttons = select6(
-            inputs.up.wait_for_low(),
-            inputs.down.wait_for_low(),
-            inputs.left.wait_for_low(),
-            inputs.right.wait_for_low(),
-            inputs.ok.wait_for_low(),
-            inputs.back.wait_for_low(),
-        );
-
-        let selection = select(selection_buttons, Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS))).await;
+        let selection = select(
+            inputs.wait_for_press(),
+            Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)),
+        )
+        .await;
 
         let action = match selection {
-            Either::First(selection_buttons) => match selection_buttons {
-                Either6::First(_) => Action::Up,
-                Either6::Second(_) => Action::Down,
-                Either6::Third(_) => Action::Left,
-                Either6::Fourth(_) => Action::Right,
-                Either6::Fifth(_) => Action::Ok,
-                Either6::Sixth(_) => Action::Back,
-            },
+            Either::First(button) => Action::Button(button),
             Either::Second(_) => Action::Timer,
         };
 
+        if Action::Timer != action {
             log::info!("Action: {:?}", action);
+        }
 
-        let new_state = if action == Action::Back {
+        let new_state = if action == Action::Button(ButtonAction::Back) {
             if state.screens.len() > 1 {
                 state.screens.pop();
             }