X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=edb234eae4fafe355e3541c1dbdfb9cb80c52ddc;hb=95486d1430d2c3f66a07c99771088a80afbb8735;hp=39e0e022014463e956cc8add88e4d824b510af02;hpb=684d0bbaff4c9fc2935eb5281c897ac40b86b73f;p=gps-watch.git

diff --git a/src/application/main.rs b/src/application/main.rs
index 39e0e02..edb234e 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -22,11 +22,13 @@
  */
 
 #![no_std]
-#![crate_type="staticlib"]
+#![no_main]
 #[link(name="libcommon.rlib")]
 
 extern crate common;
 
+mod uart0;
+
 use common::buffer::Buffer;
 use common::clock;
 use common::systick;
@@ -34,7 +36,9 @@ use common::port;
 use common::gpio;
 use common::nvic;
 use common::i2c;
+use common::uart;
 use common::usb_serial;
+use common::display;
 
 extern {
     fn enable_interrupts();
@@ -43,8 +47,9 @@ extern {
 }
 
 #[no_mangle]
-pub unsafe extern fn main() {
+pub unsafe extern "C" fn _start() -> ! {
     clock::configure();
+    clock::enable_osc0();
     systick::init();
     port::init();
 
@@ -60,6 +65,14 @@ pub unsafe extern fn main() {
     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);
@@ -72,6 +85,20 @@ pub unsafe extern fn main() {
     cdc_tx_buf.write(b"\n");
     cdc_tx_buf.flush();
 
+    let mut display = display::Display::new(gpio::GPIOB, 1 << 16, 0x3c);
+
+    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
+
     loop {
         systick::delay_ms(1000);