summaryrefslogtreecommitdiff
path: root/altosui/AltosRecord.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-08-12 14:58:34 -0700
committerKeith Packard <keithp@keithp.com>2011-08-13 18:46:12 -0700
commitc7f540330c040c521f9d7626009a406e704a5e41 (patch)
treeac56003938abefc4b0bedcd035f804da2682fae7 /altosui/AltosRecord.java
parent18369c58e62bc64b969a7cf8be3103aa33c6d4aa (diff)
altosui: Add companion support to the flight UI and CSV conversion
Shows the companion data in a new tab. Also put companion data into CSV file. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosRecord.java')
-rw-r--r--altosui/AltosRecord.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/altosui/AltosRecord.java b/altosui/AltosRecord.java
index 144b1c3c..ce6d86ab 100644
--- a/altosui/AltosRecord.java
+++ b/altosui/AltosRecord.java
@@ -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;
@@ -74,6 +75,8 @@ public class AltosRecord {
int main_deploy;
int flight_log_max;
String firmware_version;
+
+ AltosRecordCompanion companion;
/*
* Values for our MP3H6115A pressure sensor
*
@@ -267,6 +270,7 @@ public class AltosRecord {
speed = old.speed;
height = old.height;
gps = new AltosGPS(old.gps);
+ companion = old.companion;
}
public AltosRecord() {
@@ -296,5 +300,6 @@ public class AltosRecord {
speed = MISSING;
height = MISSING;
gps = new AltosGPS();
+ companion = null;
}
}