common: Make Logger calculate and publish pace.

[gps-watch.git] / src / common / logger.rs

diff --git a/src/common/logger.rs b/src/common/logger.rs
index 9b498ce64a5cec5e7f76be504fab5395a80ac41c..98a857a660ed1cbcebdbecb06cf5c8f7738f34ca 100644 (file)
--- a/src/common/logger.rs
+++ b/src/common/logger.rs
@@ -116,6 +116,13 @@ pub struct Logger<'a> {
 
     recording_started: u32,
 
+    // 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,
 
@@ -290,6 +297,10 @@ impl<'a> Logger<'a> {
             recording_id: 0,
             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],
@@ -357,6 +368,10 @@ 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);
@@ -383,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 {