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

diff --git a/src/application/main.rs b/src/application/main.rs
index 2b2f8f6..bdd1e4d 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -60,6 +60,7 @@ extern {
 enum View {
     Time,
     Distance,
+    Pace,
 }
 
 struct Timer {
@@ -88,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);
@@ -220,6 +237,8 @@ pub unsafe extern "C" fn _start() -> ! {
     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();
@@ -236,6 +255,7 @@ pub unsafe extern "C" fn _start() -> ! {
 
     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();
 
@@ -248,6 +268,7 @@ pub unsafe extern "C" fn _start() -> ! {
                 logger.log(&prev_tap, &tap);
 
                 model.update(model::Field::Distance(logger.total_distance_cm));
+                model.update(model::Field::Pace(logger.pace_s));
             }
 
             model.update(model::Field::UnixTime(tap.unix_time));
@@ -298,6 +319,11 @@ pub unsafe extern "C" fn _start() -> ! {
                     display.draw(&screen);
                 }
             },
+            View::Pace => {
+                if pace_view.draw(&mut screen, &mut model) {
+                    display.draw(&screen);
+                }
+            },
         }
 
         heart_icon_timer.update(|state| {
@@ -318,14 +344,32 @@ pub unsafe extern "C" fn _start() -> ! {
             if is_recording {
                 logger.start_recording(&prev_tap);
 
+                model.reset();
+
                 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(),
+                View::Pace => pace_view.invalidate(),
+            }
         }
 
         if reset_requested() {