X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosRecord.java;h=4dfa98be41c70619163d92acba1c631b409ced3f;hp=8976edf05b90cdb007a6a3e3517beeed58967145;hb=b5b898264077fcada29e73efa28dcbe4729f2709;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94

diff --git a/altosui/AltosRecord.java b/altosui/AltosRecord.java
index 8976edf0..4dfa98be 100644
--- 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,9 +65,19 @@ public class AltosRecord {
 	int	flight_pres;
 
 	AltosGPS	gps;
+	boolean		new_gps;
 
 	double	time;	/* seconds since boost */
 
+	int	device_type;
+	int	config_major;
+	int	config_minor;
+	int	apogee_delay;
+	int	main_deploy;
+	int	flight_log_max;
+	String	firmware_version;
+
+	AltosRecordCompanion companion;
 	/*
 	 * Values for our MP3H6115A pressure sensor
 	 *
@@ -233,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;
@@ -260,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() {
@@ -289,5 +306,7 @@ public class AltosRecord {
 		speed = MISSING;
 		height = MISSING;
 		gps = new AltosGPS();
+		new_gps = false;
+		companion = null;
 	}
 }