X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=3523b885fe9a907b081c9b85da75f9d8b3380643;hb=aa0f0d612a03799423e87e9137765ecb90146f48;hp=0fe48f7d490132ef68b06247002f4ac894bb697e;hpb=111c167160d04031c00d68b17800f5b304e643c1;p=gps-watch.git

diff --git a/src/application/main.rs b/src/application/main.rs
index 0fe48f7..3523b88 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)]
@@ -183,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;
@@ -258,6 +267,8 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
+        shell.update(&mut mx25l);
+
         if reset_requested() {
             nvic::system_reset();
         }