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

diff --git a/src/application/main.rs b/src/application/main.rs
index cf06f64..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;
@@ -45,6 +46,7 @@ use common::screen;
 use common::time::Time;
 use common::mx25l::Mx25l;
 use common::shell::Shell;
+use common::logger::Logger;
 
 extern {
     fn enable_interrupts();
@@ -122,6 +124,20 @@ fn configure_push_buttons() {
     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]
 pub unsafe extern "C" fn _start() -> ! {
     clock::configure();
@@ -192,6 +208,9 @@ pub unsafe extern "C" fn _start() -> ! {
 
     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;
@@ -207,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;
@@ -267,7 +286,7 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
-        shell.update();
+        shell.update(&mut logger);
 
         if reset_requested() {
             nvic::system_reset();