X-Git-Url: http://git.code-monkey.de/?p=gps-watch.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.rs;h=98a857a660ed1cbcebdbecb06cf5c8f7738f34ca;hp=ea84bc23d4e23ad71d73f6ec6859977e1f913a6b;hb=beddb8cf26138f9aaa5fa8bacf8aa355fa0b069c;hpb=e0a5c622e149aa80504de0a648196e444d4b038b

diff --git a/src/common/logger.rs b/src/common/logger.rs
index ea84bc2..98a857a 100644
--- a/src/common/logger.rs
+++ b/src/common/logger.rs
@@ -119,6 +119,10 @@ pub struct Logger<'a> {
     // The total distance logged of the currently running recording.
     pub total_distance_cm: u32,
 
+    split_distance_cm: u32,
+    split_duration_ms: u32,
+    pub pace_s: u32,
+
     // The number of slots filled in num_flight.
     num_in_flight: usize,
 
@@ -294,6 +298,9 @@ impl<'a> Logger<'a> {
             first_sector: 0,
             recording_started: 0,
             total_distance_cm: 0,
+            split_distance_cm: 0,
+            split_duration_ms: 0,
+            pace_s: 0,
             num_in_flight: 0,
 
             in_flight: [InFlight::new(); 7],
@@ -362,6 +369,9 @@ impl<'a> Logger<'a> {
         self.sectors_written = 0;
         self.recording_started = tap.unix_time;
         self.total_distance_cm = 0;
+        self.split_distance_cm = 0;
+        self.split_duration_ms = 0;
+        self.pace_s = 0;
         self.num_in_flight = 0;
 
         self.prepare_write_buffer(true);
@@ -372,8 +382,6 @@ impl<'a> Logger<'a> {
     }
 
     pub fn log(&mut self, prev_tap: &TimeAndPos, tap: &TimeAndPos) {
-        self.total_distance_cm += tap.distance_cm(&prev_tap) as u32;
-
         let d_time_ms = elapsed_ms(tap.system_time, prev_tap.system_time);
 
         // We know that our hardware cannot deliver updates more often
@@ -390,6 +398,20 @@ impl<'a> Logger<'a> {
         if self.write_packet(d_time_s, d_lat, d_lon) {
             self.flush_in_flight(false);
         }
+
+        let distance_cm = tap.distance_cm(&prev_tap) as u32;
+
+        self.total_distance_cm += distance_cm;
+        self.split_distance_cm += distance_cm;
+
+        self.split_duration_ms += d_time_ms;
+
+        if self.split_distance_cm >= 100_000 {
+            self.split_distance_cm -= 100_000;
+
+            self.pace_s = self.split_duration_ms / 1000;
+            self.split_duration_ms = 0;
+        }
     }
 
     pub fn stop_recording(&mut self, tap: &TimeAndPos) -> u16 {