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

diff --git a/src/application/main.rs b/src/application/main.rs
index 7eb180c..0fe48f7 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -36,10 +36,13 @@ use common::port;
 use common::gpio;
 use common::nvic;
 use common::i2c;
+use common::spi;
 use common::uart;
 use common::usb_serial;
 use common::display;
 use common::gps;
+use common::screen;
+use common::time::Time;
 
 extern {
     fn enable_interrupts();
@@ -73,6 +76,47 @@ impl Timer {
     }
 }
 
+fn reset_requested() -> bool {
+    (gpio::get(gpio::GPIOA) & (1 << 12)) == 0
+}
+
+#[inline(never)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {
+        if reset_requested() {
+            nvic::system_reset();
+        }
+    }
+}
+
+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);
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn _start() -> ! {
     clock::configure();
@@ -92,6 +136,20 @@ pub unsafe extern "C" fn _start() -> ! {
     gpio::set_direction(gpio::GPIOB, 1 << 16, gpio::Direction::Output);
     port::set_af(port::PORTB, 16, 1);
 
+    // Configure pin for the MX25L's chip select line.
+    gpio::set_direction(gpio::GPIOD, 1 << 0, gpio::Direction::Output);
+    port::set_af(port::PORTD, 0, 1);
+    gpio::set(gpio::GPIOD, 1 << 0);
+
+    // Configure pins for SPI0.
+    port::set_af(port::PORTD, 1, 2);
+    port::set_af(port::PORTD, 2, 5);
+    port::set_af(port::PORTD, 3, 5);
+
+    spi::configure(spi::SPI0);
+
+    nvic::disable_irq(10); // SPI0
+
     // Configure pins for UART0.
     port::set_af(port::PORTE, 20, 4);
     port::set_af(port::PORTE, 21, 4);
@@ -100,10 +158,7 @@ pub unsafe extern "C" fn _start() -> ! {
     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);
-    port::set_pull(port::PORTA, 12, port::Pull::Up);
+    configure_push_buttons();
 
     enable_interrupts();
 
@@ -117,6 +172,8 @@ pub unsafe extern "C" fn _start() -> ! {
     display.init();
     display.clear();
 
+    let mut screen = screen::Screen::new();
+
     // Hold GPS in reset while configuring its UART.
     gpio::clear(gpio::GPIOB, 1);
     systick::delay_ms(50);
@@ -134,11 +191,18 @@ pub unsafe extern "C" fn _start() -> ! {
     let mut heart_icon_timer = Timer::new(1000);
     let mut gps_icon_timer = Timer::new(500);
 
+    let mut prev_tap = gps::TimeAndPos::new();
+
     loop {
         let mut tap = gps::TimeAndPos::new();
+        let mut show_time = false;
         let old_gps_has_fix = gps_has_fix;
 
         while gps.update(&mut tap) {
+            prev_tap = tap;
+
+            show_time = true;
+
             gps_has_fix = true;
             gps_has_fix_ticks = systick::now();
         }
@@ -172,6 +236,18 @@ pub unsafe extern "C" fn _start() -> ! {
             });
         }
 
+        if show_time {
+            if let Some(tm) = Time::from_unix_time(prev_tap.unix_time) {
+                let mut time_s = [b' '; 8];
+                tm.fmt_time(&mut time_s);
+
+                screen.clear();
+                screen.draw_text(&time_s);
+
+                display.draw(&screen);
+            }
+        }
+
         heart_icon_timer.update(|state| {
             if state == 1 {
                 display.hide_icon(display::Icon::Heart);
@@ -182,7 +258,7 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
-        if (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 {
+        if reset_requested() {
             nvic::system_reset();
         }
     }