X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosRecord.java;h=4643d69a308a802f91748b39037c7c3da02d7aef;hb=64e2e66a5239541b15f43172655cfb3560bec79b;hp=ce6d86ab5294a1fb96538df6a72af6e181e4118a;hpb=c7f540330c040c521f9d7626009a406e704a5e41;p=fw%2Faltos diff --git a/altosui/AltosRecord.java b/altosui/AltosRecord.java index ce6d86ab..4643d69a 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 { final static int MISSING = 0x7fffffff; static final int seen_flight = 1; @@ -65,6 +65,10 @@ public class AltosRecord { int flight_pres; AltosGPS gps; + boolean new_gps; + + AltosIMU imu; + AltosMag mag; double time; /* seconds since boost */ @@ -243,6 +247,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; @@ -270,7 +278,10 @@ public class AltosRecord { speed = old.speed; height = old.height; gps = new AltosGPS(old.gps); + new_gps = false; companion = old.companion; + imu = old.imu; + mag = old.mag; } public AltosRecord() { @@ -300,6 +311,7 @@ public class AltosRecord { speed = MISSING; height = MISSING; gps = new AltosGPS(); + new_gps = false; companion = null; } }