use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosRecord.java

diff --git a/altosui/AltosRecord.java b/altosui/AltosRecord.java
index 200fffe5db993e1a7336fe2add88ff412dcb4482..ce6d86ab5294a1fb96538df6a72af6e181e4118a 100644 (file)
--- a/altosui/AltosRecord.java
+++ b/altosui/AltosRecord.java
@@ -25,6 +25,16 @@ import java.io.*;
 public class AltosRecord {
        final static int        MISSING = 0x7fffffff;
 
+       static final int        seen_flight = 1;
+       static final int        seen_sensor = 2;
+       static final int        seen_temp_volt = 4;
+       static final int        seen_deploy = 8;
+       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;
        String  callsign;
        int     serial;
@@ -58,6 +68,15 @@ public class AltosRecord {
 
        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
         *
@@ -226,6 +245,7 @@ public class AltosRecord {
 
        public AltosRecord(AltosRecord old) {
                version = old.version;
+               seen = old.seen;
                callsign = old.callsign;
                serial = old.serial;
                flight = old.flight;
@@ -250,10 +270,12 @@ public class AltosRecord {
                speed = old.speed;
                height = old.height;
                gps = new AltosGPS(old.gps);
+               companion = old.companion;
        }
 
        public AltosRecord() {
                version = 0;
+               seen = 0;
                callsign = "N0CALL";
                serial = 0;
                flight = 0;
@@ -278,5 +300,6 @@ public class AltosRecord {
                speed = MISSING;
                height = MISSING;
                gps = new AltosGPS();
+               companion = null;
        }
 }