X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fapplication%2Fmain.rs;h=bdd1e4d14c6d9d664485ce999972cf10829938fd;hb=bfb67fecfcab874dfbedce7001bbf991fadd7d73;hp=a8101f74f80542373a896f54730b7db90a4e933e;hpb=c5c9ca9f5e06a983388f9a4934675c54be7341aa;p=gps-watch.git

diff --git a/src/application/main.rs b/src/application/main.rs
index a8101f7..bdd1e4d 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -28,6 +28,9 @@
 extern crate common;
 
 mod uart0;
+mod button;
+mod model;
+mod views;
 
 use common::buffer::Buffer;
 use common::ringbuf::Ringbuf;
@@ -43,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;
@@ -54,6 +56,13 @@ extern {
     static mut cdc_tx_buf: Buffer;
 }
 
+#[derive(Clone, Copy, PartialEq)]
+enum View {
+    Time,
+    Distance,
+    Pace,
+}
+
 struct Timer {
     state: u32,
     delay_ms: u32,
@@ -80,6 +89,22 @@ impl Timer {
     }
 }
 
+fn next_view(view: View) -> View {
+    match view {
+        View::Time => View::Distance,
+        View::Distance => View::Pace,
+        View::Pace => View::Time,
+    }
+}
+
+fn previous_view(view: View) -> View {
+    match view {
+        View::Time => View::Pace,
+        View::Distance => View::Time,
+        View::Pace => View::Distance,
+    }
+}
+
 fn reset_requested() -> bool {
     let pta1 = gpio::get(gpio::GPIOA) & (1 << 1);
     let pte25 = gpio::get(gpio::GPIOE) & (1 << 25);
@@ -124,10 +149,6 @@ fn configure_push_buttons() {
     port::set_pull(port::PORTE, 31, port::Pull::Up);
 }
 
-fn poll_pta12() -> bool {
-    (gpio::get(gpio::GPIOA) & (1 << 12)) == 0
-}
-
 fn uart0_try_read() -> Option<u8> {
     extern {
         static mut uart0_rx_buf: Ringbuf;
@@ -215,8 +236,9 @@ pub unsafe extern "C" fn _start() -> ! {
     let mut logger = Logger::new(&mut mx25l);
     logger.init();
 
-    let mut pta1_start_press_ticks = 0;
-    let mut pta12_was_pressed = poll_pta12();
+    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();
@@ -229,19 +251,29 @@ 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 pace_view = views::PaceView::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, uart0_try_read) {
             if is_recording {
                 logger.log(&prev_tap, &tap);
+
+                model.update(model::Field::Distance(logger.total_distance_cm));
+                model.update(model::Field::Pace(logger.pace_s));
             }
 
-            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();
@@ -276,16 +308,22 @@ 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);
+                }
+            },
+            View::Pace => {
+                if pace_view.draw(&mut screen, &mut model) {
+                    display.draw(&screen);
+                }
+            },
         }
 
         heart_icon_timer.update(|state| {
@@ -300,23 +338,39 @@ pub unsafe extern "C" fn _start() -> ! {
 
         shell.update(&mut logger);
 
-        let pta12_is_pressed = poll_pta12();
+        if pta12.has_been_held_for_ms(1500) {
+            is_recording = !is_recording;
 
-        if !pta12_was_pressed && pta12_is_pressed {
-            pta1_start_press_ticks = systick::now();
-        } else if pta12_was_pressed && !pta12_is_pressed {
-            if systick::has_timeout_ms(pta1_start_press_ticks, 1500) {
-                is_recording = !is_recording;
+            if is_recording {
+                logger.start_recording(&prev_tap);
 
-                if is_recording {
-                    logger.start_recording(&prev_tap);
-                } else {
-                    logger.stop_recording(&prev_tap);
-                }
+                model.reset();
+
+                view = View::Distance;
+            } else {
+                logger.stop_recording(&prev_tap);
+
+                view = View::Time;
             }
         }
 
-        pta12_was_pressed = pta12_is_pressed;
+        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(),
+                View::Pace => pace_view.invalidate(),
+            }
+        }
 
         if reset_requested() {
             nvic::system_reset();