Skip to content
Snippets Groups Projects
Commit 900fcb00 authored by zdmx's avatar zdmx :crab:
Browse files

Fix input controller, make linter a little happier

parent 064b2b47
No related branches found
No related tags found
No related merge requests found
......@@ -16,27 +16,27 @@ impl BadgeLink {
}
}
pub fn left_audio(&mut self) {
pub fn left_audio(&mut self) -> Result<(), hal::i2c::Error> {
let mut pes = self.port_expander.split();
pes.p3.set_low();
pes.p4.set_low();
pes.p3.set_low()?;
pes.p4.set_low()
}
pub fn left_badgelink(&mut self) {
pub fn left_badgelink(&mut self) -> Result<(), hal::i2c::Error> {
let mut pes = self.port_expander.split();
pes.p3.set_high();
pes.p4.set_high();
pes.p3.set_high()?;
pes.p4.set_high()
}
pub fn right_audio(&mut self) {
pub fn right_audio(&mut self) -> Result<(), hal::i2c::Error> {
let mut pes = self.port_expander.split();
pes.p5.set_low();
pes.p6.set_low();
pes.p5.set_low()?;
pes.p6.set_low()
}
pub fn right_badgelink(&mut self) {
pub fn right_badgelink(&mut self) -> Result<(), hal::i2c::Error> {
let mut pes = self.port_expander.split();
pes.p5.set_high();
pes.p6.set_high();
pes.p5.set_high()?;
pes.p6.set_high()
}
}
......@@ -125,17 +125,7 @@ pub async fn input_controller(
let mut sw1_button = sw1_button.into_pull_up_input();
let mut sw2_button = sw2_button.into_pull_up_input();
let shared_i2c = shared_bus::BusManagerSimple::new(i2c);
let mut pe1 = port_expander::Max7321::new(shared_i2c.acquire_i2c(), true, true, true, false);
let mut pe1_io = pe1.split();
pe1_io.p1.set_high().unwrap();
let _in_r_sw = pe1_io.p3;
let _in_t_sw = pe1_io.p4;
let _out_r_sw = pe1_io.p5;
let _out_t_sw = pe1_io.p6;
let mut pe2 = port_expander::Max7321::new(shared_i2c.acquire_i2c(), true, true, false, true);
let mut pe2 = port_expander::Max7321::new(i2c, true, true, false, true);
let pe2_io = pe2.split();
let mut sw1_r = pe2_io.p0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment