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

diff --git a/src/application/main.rs b/src/application/main.rs
index 8f31ff8..e11aaf7 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -30,6 +30,7 @@ extern crate common;
 mod uart0;
 
 use common::buffer::Buffer;
+use common::ringbuf::Ringbuf;
 use common::clock;
 use common::systick;
 use common::port;
@@ -43,6 +44,9 @@ use common::display;
 use common::gps;
 use common::screen;
 use common::time::Time;
+use common::mx25l::Mx25l;
+use common::shell::Shell;
+use common::logger::Logger;
 
 extern {
     fn enable_interrupts();
@@ -77,7 +81,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)]
@@ -91,10 +98,44 @@ 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);
+}
+
+fn uart0_try_read() -> Option<u8> {
+    extern {
+        static mut uart0_rx_buf: Ringbuf;
+    }
+
+    unsafe {
+        if uart0_rx_buf.is_empty() {
+            None
+        } else {
+            Some(uart0_rx_buf.read())
+        }
+    }
 }
 
 #[no_mangle]
@@ -163,6 +204,13 @@ 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 logger = Logger::new(&mut mx25l);
+    logger.init();
+
     let mut gps = gps::Gps::new();
 
     let mut gps_has_fix = false;
@@ -178,7 +226,7 @@ pub unsafe extern "C" fn _start() -> ! {
         let mut show_time = false;
         let old_gps_has_fix = gps_has_fix;
 
-        while gps.update(&mut tap) {
+        while gps.update(&mut tap, uart0_try_read) {
             prev_tap = tap;
 
             show_time = true;
@@ -238,6 +286,8 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
+        shell.update(&mut logger);
+
         if reset_requested() {
             nvic::system_reset();
         }