altosui: Output recorded clock tick in CSV files

[fw/altos] / altosui / AltosRecord.java

diff --git a/altosui/AltosRecord.java b/altosui/AltosRecord.java
index 144b1c3c5a1a94caa847ab4bf8b11655082e0677..4dfa98be41c70619163d92acba1c631b409ced3f 100644 (file)
--- a/altosui/AltosRecord.java
+++ b/altosui/AltosRecord.java
@@ -22,7 +22,7 @@ import java.text.*;
 import java.util.HashMap;
 import java.io.*;
 
-public class AltosRecord {
+public class AltosRecord implements Comparable <AltosRecord> {
        final static int        MISSING = 0x7fffffff;
 
        static final int        seen_flight = 1;
@@ -32,6 +32,7 @@ public class AltosRecord {
        static final int        seen_gps_time = 16;
        static final int        seen_gps_lat = 32;
        static final int        seen_gps_lon = 64;
+       static final int        seen_companion = 128;
        int                     seen;
 
        int     version;
@@ -64,6 +65,7 @@ public class AltosRecord {
        int     flight_pres;
 
        AltosGPS        gps;
+       boolean         new_gps;
 
        double  time;   /* seconds since boost */
 
@@ -74,6 +76,8 @@ public class AltosRecord {
        int     main_deploy;
        int     flight_log_max;
        String  firmware_version;
+
+       AltosRecordCompanion companion;
        /*
         * Values for our MP3H6115A pressure sensor
         *
@@ -240,6 +244,10 @@ public class AltosRecord {
                return null;
        }
 
+       public int compareTo(AltosRecord o) {
+               return tick - o.tick;
+       }
+
        public AltosRecord(AltosRecord old) {
                version = old.version;
                seen = old.seen;
@@ -267,6 +275,8 @@ public class AltosRecord {
                speed = old.speed;
                height = old.height;
                gps = new AltosGPS(old.gps);
+               new_gps = false;
+               companion = old.companion;
        }
 
        public AltosRecord() {
@@ -296,5 +306,7 @@ public class AltosRecord {
                speed = MISSING;
                height = MISSING;
                gps = new AltosGPS();
+               new_gps = false;
+               companion = null;
        }
 }