X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapplication%2Fmain.rs;h=cf06f640b529cc8b79c2247762bcb308b6028b7f;hb=5897e4ea6cc3ba413190f475a29bb3f745b66887;hp=247663081a9c25faf12d1f47557d214d947678a3;hpb=f1757e8d13dba2a0f06abbeb6aed84c39c272fd0;p=gps-watch.git

diff --git a/src/application/main.rs b/src/application/main.rs
index 2476630..cf06f64 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -43,6 +43,8 @@ use common::display;
 use common::gps;
 use common::screen;
 use common::time::Time;
+use common::mx25l::Mx25l;
+use common::shell::Shell;
 
 extern {
     fn enable_interrupts();
@@ -77,7 +79,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 +95,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 +163,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();
 
@@ -159,6 +188,10 @@ pub unsafe extern "C" fn _start() -> ! {
 
     nvic::enable_irq(12); // UART0
 
+    let mut shell = Shell::new(&mut cdc_tx_buf);
+
+    let mut mx25l = Mx25l::new(gpio::GPIOD, 1 << 0);
+
     let mut gps = gps::Gps::new();
 
     let mut gps_has_fix = false;
@@ -234,6 +267,8 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
+        shell.update();
+
         if reset_requested() {
             nvic::system_reset();
         }