application: Only reset the model when starting a new recording.

[gps-watch.git] / src / application / main.rs

diff --git a/src/application/main.rs b/src/application/main.rs
index 2b2f8f66bffd3b4441b13377d7e6c57f6ce88c0f..95a60dad6d266560a86e045b45f2175020346ebc 100644 (file)
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -88,6 +88,20 @@ 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 {
     let pta1 = gpio::get(gpio::GPIOA) & (1 << 1);
     let pte25 = gpio::get(gpio::GPIOE) & (1 << 25);
@@ -220,6 +234,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();
@@ -318,14 +334,31 @@ 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;
             }
+        }
+
+        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;
 
-            model.reset();
+            match view {
+                View::Time => time_view.invalidate(),
+                View::Distance => distance_view.invalidate(),
+            }
         }
 
         if reset_requested() {