X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=8f31ff8015ac29e30c8d4130e5dfe381e9e1809d;hb=bf60d7cf069a190b6d0310cc9682a6041d2f831d;hp=8f7bd6d1da6cdf5b76a16927b34cd5d0ad92b1b1;hpb=b6b84d79c9da6f52e1f7ba4d2bac55acd340f06d;p=gps-watch.git

diff --git a/src/application/main.rs b/src/application/main.rs
index 8f7bd6d..8f31ff8 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -76,16 +76,27 @@ impl Timer {
     }
 }
 
+fn reset_requested() -> bool {
+    (gpio::get(gpio::GPIOA) & (1 << 12)) == 0
+}
+
 #[inline(never)]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
     loop {
-        if (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 {
+        if reset_requested() {
             nvic::system_reset();
         }
     }
 }
 
+fn configure_push_buttons() {
+    // 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);
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn _start() -> ! {
     clock::configure();
@@ -127,10 +138,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();
 
@@ -230,7 +238,7 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
-        if (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 {
+        if reset_requested() {
             nvic::system_reset();
         }
     }