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

diff --git a/src/application/main.rs b/src/application/main.rs
index ac87977..dc955ce 100644
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -28,6 +28,7 @@
 extern crate common;
 
 mod uart0;
+mod button;
 
 use common::buffer::Buffer;
 use common::ringbuf::Ringbuf;
@@ -124,10 +125,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 +212,7 @@ 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 is_recording = false;
 
     let mut gps = gps::Gps::new();
@@ -229,8 +225,6 @@ pub unsafe extern "C" fn _start() -> ! {
 
     let mut prev_tap = gps::TimeAndPos::new();
 
-    let mut total_distance_cm = 0;
-
     loop {
         let mut tap = gps::TimeAndPos::new();
         let mut show_time = false;
@@ -241,8 +235,6 @@ pub unsafe extern "C" fn _start() -> ! {
             if is_recording {
                 logger.log(&prev_tap, &tap);
 
-                total_distance_cm += tap.distance_cm(&prev_tap) as u32;
-
                 show_distance = true;
             }
 
@@ -286,7 +278,8 @@ pub unsafe extern "C" fn _start() -> ! {
         if show_distance {
             let mut distance_m_s = [b' '; 8];
 
-            common::fmt::fmt_u32(&mut distance_m_s, total_distance_cm / 100);
+            common::fmt::fmt_u32(&mut distance_m_s,
+                                 logger.total_distance_cm / 100);
 
             screen.clear();
             screen.draw_text(&distance_m_s);
@@ -316,26 +309,16 @@ pub unsafe extern "C" fn _start() -> ! {
 
         shell.update(&mut logger);
 
-        let pta12_is_pressed = poll_pta12();
-
-        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 pta12.has_been_held_for_ms(1500) {
+            is_recording = !is_recording;
 
-                if is_recording {
-                    logger.start_recording(&prev_tap);
-                } else {
-                    logger.stop_recording(&prev_tap);
-                }
-
-                total_distance_cm = 0;
+            if is_recording {
+                logger.start_recording(&prev_tap);
+            } else {
+                logger.stop_recording(&prev_tap);
             }
         }
 
-        pta12_was_pressed = pta12_is_pressed;
-
         if reset_requested() {
             nvic::system_reset();
         }