X-Git-Url: http://git.code-monkey.de/?p=gps-watch.git;a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;fp=src%2Fapplication%2Fmain.rs;h=2b2f8f66bffd3b4441b13377d7e6c57f6ce88c0f;hp=dc955ce7af46fb39fc5b37721e4b12c5b7cbcbd3;hb=683135c35c05cd547f8a77b3602c2ddc78c1e887;hpb=70fb2fadd8688fdc11ba1d398661ac99aaa1b02a

diff --git a/src/application/main.rs b/src/application/main.rs
index dc955ce..2b2f8f6 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -29,6 +29,8 @@ extern crate common;
 
 mod uart0;
 mod button;
+mod model;
+mod views;
 
 use common::buffer::Buffer;
 use common::ringbuf::Ringbuf;
@@ -44,7 +46,6 @@ 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;
@@ -55,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,
@@ -225,22 +232,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 mut show_distance = false;
         let old_gps_has_fix = gps_has_fix;
 
         while gps.update(&mut tap, uart0_try_read) {
             if is_recording {
                 logger.log(&prev_tap, &tap);
 
-                show_distance = true;
+                model.update(model::Field::Distance(logger.total_distance_cm));
             }
 
-            prev_tap = tap;
+            model.update(model::Field::UnixTime(tap.unix_time));
 
-            show_time = true;
+            prev_tap = tap;
 
             gps_has_fix = true;
             gps_has_fix_ticks = systick::now();
@@ -275,26 +287,17 @@ pub unsafe extern "C" fn _start() -> ! {
             });
         }
 
-        if show_distance {
-            let mut distance_m_s = [b' '; 8];
-
-            common::fmt::fmt_u32(&mut distance_m_s,
-                                 logger.total_distance_cm / 100);
-
-            screen.clear();
-            screen.draw_text(&distance_m_s);
-
-            display.draw(&screen);
-        } else 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| {
@@ -314,9 +317,15 @@ pub unsafe extern "C" fn _start() -> ! {
 
             if is_recording {
                 logger.start_recording(&prev_tap);
+
+                view = View::Distance;
             } else {
                 logger.stop_recording(&prev_tap);
+
+                view = View::Time;
             }
+
+            model.reset();
         }
 
         if reset_requested() {