X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcommon%2Flogger.rs;h=8a1c05cd75f89b676635b7a37c991cde1c84688b;hb=8131a71527b5279bca9b80aac37596f6264ea2a1;hp=2ca2e22980f48b7867abddae91b2e09e1506c7d2;hpb=241e581359f381c5aaa18cefa3dbcb7d46241267;p=gps-watch.git

diff --git a/src/common/logger.rs b/src/common/logger.rs
index 2ca2e22..8a1c05c 100644
--- a/src/common/logger.rs
+++ b/src/common/logger.rs
@@ -360,7 +360,7 @@ impl<'a> Logger<'a> {
 
         self.prepare_write_buffer(true);
 
-        self.write_packet(0, tap.latitude, tap.longitude);
+        self.write_packet(0, tap.latitude_deg, tap.longitude_deg);
 
         self.recording_id
     }
@@ -376,8 +376,8 @@ impl<'a> Logger<'a> {
         // the intervals to full seconds.
         let d_time_s = (d_time_ms + 500) / 1000;
 
-        let d_lat = tap.latitude - prev_tap.latitude;
-        let d_lon = tap.longitude - prev_tap.longitude;
+        let d_lat = tap.latitude_deg - prev_tap.latitude_deg;
+        let d_lon = tap.longitude_deg - prev_tap.longitude_deg;
 
         if self.write_packet(d_time_s, d_lat, d_lon) {
             self.flush_in_flight(false);
@@ -554,6 +554,17 @@ impl<'a> Logger<'a> {
                 continue;
             }
 
+            let mut num_data_sectors = 0;
+
+            for d in 1..NUM_SECTORS {
+                let wrapped_index = ((index + d) & (NUM_SECTORS - 1)) as usize;
+                let other_sector_header = &self.sector_header[wrapped_index];
+
+                if other_sector_header.belongs_to(sector_header.recording_id) {
+                    num_data_sectors += 1;
+                }
+            }
+
             let mut date_time_s = [b' '; 19];
 
             if let Some(tm) = Time::from_unix_time(sector_header.start_time) {
@@ -561,6 +572,13 @@ impl<'a> Logger<'a> {
                 tm.fmt_time(&mut date_time_s[11..]);
             }
 
+            let recording_size = (num_data_sectors + 1) * (SECTOR_SIZE >> 10);
+
+            let mut recording_size_s = [b'0'; 9];
+            let recording_size_s_len = fmt_u32_pad(&mut recording_size_s,
+                                                   recording_size as u32,
+                                                   8, b' ');
+
             let mut recording_id_s = [b'0'; 9];
             let recording_id_s_len =
                 fmt_u32_pad(&mut recording_id_s,
@@ -568,7 +586,8 @@ impl<'a> Logger<'a> {
                             8, b' ');
 
             tx_buf.write(&date_time_s);
-            tx_buf.write(b"       ");
+            tx_buf.write(&recording_size_s[0..recording_size_s_len]);
+            tx_buf.write(b"K");
             tx_buf.write(&recording_id_s[0..recording_id_s_len]);
             tx_buf.write(b"\n");