X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=f1eb522a739068dda8977821c694e7bf768d215a;hb=b00dd201b1c26fbd72c4930e26e3420ad8c276a0;hp=247663081a9c25faf12d1f47557d214d947678a3;hpb=f1757e8d13dba2a0f06abbeb6aed84c39c272fd0;p=gps-watch.git diff --git a/src/application/main.rs b/src/application/main.rs index 2476630..f1eb522 100644 --- a/src/application/main.rs +++ b/src/application/main.rs @@ -77,7 +77,10 @@ impl Timer { } fn reset_requested() -> bool { - (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 + let pta1 = gpio::get(gpio::GPIOA) & (1 << 1); + let pte25 = gpio::get(gpio::GPIOE) & (1 << 25); + + (pta1 | pte25) == 0 } #[inline(never)] @@ -90,6 +93,33 @@ fn panic(_info: &core::panic::PanicInfo) -> ! { } } +fn configure_push_buttons() { + // Configure lower right push button. + gpio::set_direction(gpio::GPIOA, 1 << 1, gpio::Direction::Input); + port::set_af(port::PORTA, 1, 1); + port::set_pull(port::PORTA, 1, port::Pull::Up); + + // Configure upper right push button. + gpio::set_direction(gpio::GPIOA, 1 << 12, gpio::Direction::Input); + port::set_af(port::PORTA, 12, 1); + port::set_pull(port::PORTA, 12, port::Pull::Up); + + // Configure lower left push button. + gpio::set_direction(gpio::GPIOE, 1 << 24, gpio::Direction::Input); + port::set_af(port::PORTE, 24, 1); + port::set_pull(port::PORTE, 24, port::Pull::Up); + + // Configure upper left push button. + gpio::set_direction(gpio::GPIOE, 1 << 25, gpio::Direction::Input); + port::set_af(port::PORTE, 25, 1); + port::set_pull(port::PORTE, 25, port::Pull::Up); + + // Configure middle left push button. + gpio::set_direction(gpio::GPIOE, 1 << 31, gpio::Direction::Input); + port::set_af(port::PORTE, 31, 1); + port::set_pull(port::PORTE, 31, port::Pull::Up); +} + #[no_mangle] pub unsafe extern "C" fn _start() -> ! { clock::configure(); @@ -131,10 +161,7 @@ pub unsafe extern "C" fn _start() -> ! { gpio::set_direction(gpio::GPIOB, 1 << 1, gpio::Direction::Output); port::set_af(port::PORTB, 1, 1); - // Configure upper right push button. - gpio::set_direction(gpio::GPIOA, 1 << 12, gpio::Direction::Input); - port::set_af(port::PORTA, 12, 1); - port::set_pull(port::PORTA, 12, port::Pull::Up); + configure_push_buttons(); enable_interrupts();