X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=a7755030bb0f5da0bd11d0a1687de17f090cac8b;hb=451b8e1950510db8c8779455bae50879b172e872;hp=815429ed1410645a15910edbc56eaac5a719bd11;hpb=8b09b780219fb53132e4271e4e71f2c779c47321;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 815429e..a775503 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -75,7 +75,7 @@ fn bootloader_requested() -> bool {
     let start_ticks = systick::now();
 
     while !systick::has_timeout_ms(start_ticks, 3000) {
-        if (gpio::get(gpio::GPIOE) & (1 << 24)) == 0 {
+        if (gpio::get(gpio::GPIOE) & (1 << 31)) == 0 {
             return true;
         }
     }
@@ -83,6 +83,13 @@ fn bootloader_requested() -> bool {
     false
 }
 
+#[inline(never)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn _start() -> ! {
     watchdog::disable();
@@ -90,10 +97,10 @@ pub unsafe extern "C" fn _start() -> ! {
     systick::init();
     port::init();
 
-    // 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 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);
 
     enable_interrupts();