finga/clock_generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fw-rust: Refactor home screen
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Add new function for easier instantiation and refactor the input
function.
This commit is contained in:
finga 2022-03-15 19:03:36 +01:00
parent 2ec8d1aeb9
commit 0003717408
1 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
firmware/rust/src/main.rs
View file

@ -426,38 +426,34 @@ struct HomeScreen {
} }
impl HomeScreen { impl HomeScreen {
fn input(&self, input: &Input) -> Screens { fn new() -> Self {
match input { Self {
Input::Next => match self.active { active: HomeSelection::Ch1,
HomeSelection::Ch1 => Screens::Home(HomeScreen {
active: HomeSelection::Ch2,
}),
HomeSelection::Ch2 => Screens::Home(HomeScreen {
active: HomeSelection::Ch3,
}),
HomeSelection::Ch3 => Screens::Home(HomeScreen {
active: HomeSelection::Setup,
}),
HomeSelection::Setup => Screens::Home(HomeScreen {
active: HomeSelection::Ch1,
}),
},
Input::Previous => match self.active {
HomeSelection::Ch1 => Screens::Home(HomeScreen {
active: HomeSelection::Setup,
}),
HomeSelection::Ch2 => Screens::Home(HomeScreen {
active: HomeSelection::Ch1,
}),
HomeSelection::Ch3 => Screens::Home(HomeScreen {
active: HomeSelection::Ch2,
}),
HomeSelection::Setup => Screens::Home(HomeScreen {
active: HomeSelection::Ch3,
}),
},
} }
} }
fn input(&self, input: &Input) -> Screens {
Screens::Home(Self {
active: match self.active {
HomeSelection::Ch1 => match input {
Input::Next => HomeSelection::Ch2,
Input::Previous => HomeSelection::Setup,
},
HomeSelection::Ch2 => match input {
Input::Next => HomeSelection::Ch3,
Input::Previous => HomeSelection::Ch1,
},
HomeSelection::Ch3 => match input {
Input::Next => HomeSelection::Setup,
Input::Previous => HomeSelection::Ch2,
},
HomeSelection::Setup => match input {
Input::Next => HomeSelection::Ch1,
Input::Previous => HomeSelection::Ch3,
},
},
})
}
} }
impl Draw for HomeScreen { impl Draw for HomeScreen {
@ -586,9 +582,7 @@ fn main() -> ! {
delay.delay_ms(2000_u16); delay.delay_ms(2000_u16);
// Set home screen // Set home screen
screen = Screens::Home(HomeScreen { screen = Screens::Home(HomeScreen::new());
active: HomeSelection::Ch1,
});
// Draw screen // Draw screen
lcd.draw(&screen); lcd.draw(&screen);