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

diff --git a/src/application/main.rs b/src/application/main.rs
index 8f31ff8..6e8d37d 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -28,8 +28,12 @@
 extern crate common;
 
 mod uart0;
+mod button;
+mod model;
+mod views;
 
 use common::buffer::Buffer;
+use common::ringbuf::Ringbuf;
 use common::clock;
 use common::systick;
 use common::port;
@@ -42,7 +46,9 @@ use common::usb_serial;
 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();
@@ -50,6 +56,12 @@ extern {
     static mut cdc_tx_buf: Buffer;
 }
 
+#[derive(Clone, Copy, PartialEq)]
+enum View {
+    Time,
+    Distance,
+}
+
 struct Timer {
     state: u32,
     delay_ms: u32,
@@ -76,8 +88,25 @@ impl Timer {
     }
 }
 
+fn next_view(view: View) -> View {
+    match view {
+        View::Time => View::Distance,
+        View::Distance => View::Time,
+    }
+}
+
+fn previous_view(view: View) -> View {
+    match view {
+        View::Time => View::Distance,
+        View::Distance => View::Time,
+    }
+}
+
 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 +120,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 +226,18 @@ 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 pta12 = button::Button::new(gpio::GPIOA, 1 << 12);
+    let mut pte24 = button::Button::new(gpio::GPIOE, 1 << 24);
+    let mut pta01 = button::Button::new(gpio::GPIOA, 1 << 1);
+    let mut is_recording = false;
+
     let mut gps = gps::Gps::new();
 
     let mut gps_has_fix = false;
@@ -173,15 +248,27 @@ pub unsafe extern "C" fn _start() -> ! {
 
     let mut prev_tap = gps::TimeAndPos::new();
 
+    let mut view = View::Time;
+
+    let mut time_view = views::TimeView::new();
+    let mut distance_view = views::DistanceView::new();
+
+    let mut model = model::Model::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;
+        while gps.update(&mut tap, uart0_try_read) {
+            if is_recording {
+                logger.log(&prev_tap, &tap);
+
+                model.update(model::Field::Distance(logger.total_distance_cm));
+            }
 
-            show_time = true;
+            model.update(model::Field::UnixTime(tap.unix_time));
+
+            prev_tap = tap;
 
             gps_has_fix = true;
             gps_has_fix_ticks = systick::now();
@@ -216,16 +303,17 @@ 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);
-            }
+        match view {
+            View::Time => {
+                if time_view.draw(&mut screen, &mut model) {
+                    display.draw(&screen);
+                }
+            },
+            View::Distance => {
+                if distance_view.draw(&mut screen, &mut model) {
+                    display.draw(&screen);
+                }
+            },
         }
 
         heart_icon_timer.update(|state| {
@@ -238,6 +326,41 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
+        shell.update(&mut logger);
+
+        if pta12.has_been_held_for_ms(1500) {
+            is_recording = !is_recording;
+
+            if is_recording {
+                logger.start_recording(&prev_tap);
+
+                view = View::Distance;
+            } else {
+                logger.stop_recording(&prev_tap);
+
+                view = View::Time;
+            }
+
+            model.reset();
+        }
+
+        let new_view = if pte24.has_been_held_for_ms(250) {
+            previous_view(view)
+        } else if pta01.has_been_held_for_ms(250) {
+            next_view(view)
+        } else {
+            view
+        };
+
+        if view != new_view {
+            view = new_view;
+
+            match view {
+                View::Time => time_view.invalidate(),
+                View::Distance => distance_view.invalidate(),
+            }
+        }
+
         if reset_requested() {
             nvic::system_reset();
         }