X-Git-Url: http://git.code-monkey.de/?p=gps-watch.git;a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=dbd748c8e28013e25f5c62afdd8f24d68251ba86;hp=e14c8f06e65eeded4d6d54539490ff6ed6510356;hb=f33681815491184edca121e8005de0281aa611ac;hpb=cd2cd4863868192ed4442e2a1abe169b12a3cc70

diff --git a/src/application/main.rs b/src/application/main.rs
index e14c8f0..dbd748c 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -27,6 +27,8 @@
 
 extern crate common;
 
+mod uart0;
+
 use common::buffer::Buffer;
 use common::clock;
 use common::systick;
@@ -34,8 +36,10 @@ use common::port;
 use common::gpio;
 use common::nvic;
 use common::i2c;
+use common::uart;
 use common::usb_serial;
 use common::display;
+use common::gps;
 
 extern {
     fn enable_interrupts();
@@ -62,6 +66,14 @@ pub unsafe extern "C" fn _start() -> ! {
     gpio::set_direction(gpio::GPIOB, 1 << 16, gpio::Direction::Output);
     port::set_af(port::PORTB, 16, 1);
 
+    // Configure pins for UART0.
+    port::set_af(port::PORTE, 20, 4);
+    port::set_af(port::PORTE, 21, 4);
+
+    // Configure pin for the GPS's reset line.
+    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);
@@ -79,11 +91,22 @@ pub unsafe extern "C" fn _start() -> ! {
     display.init();
     display.clear();
 
+    // Hold GPS in reset while configuring its UART.
+    gpio::clear(gpio::GPIOB, 1);
+    systick::delay_ms(50);
+    uart::configure(uart::UART0);
+    systick::delay_ms(50);
+    gpio::set(gpio::GPIOB, 1);
+
+    nvic::enable_irq(12); // UART0
+
+    let mut gps = gps::Gps::new();
+
     loop {
-        systick::delay_ms(1000);
+        let mut tap = gps::TimeAndPos::new();
 
-        cdc_tx_buf.write(b".\n");
-        cdc_tx_buf.flush();
+        while gps.update(&mut tap) {
+        }
 
         if (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 {
             nvic::system_reset();