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 8976edf05b90cdb007a6a3e3517beeed58967145..ce6d86ab5294a1fb96538df6a72af6e181e4118a 100644 (file)
--- 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;
@@ -67,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
         *
@@ -260,6 +270,7 @@ public class AltosRecord {
                speed = old.speed;
                height = old.height;
                gps = new AltosGPS(old.gps);
+               companion = old.companion;
        }
 
        public AltosRecord() {
@@ -289,5 +300,6 @@ public class AltosRecord {
                speed = MISSING;
                height = MISSING;
                gps = new AltosGPS();
+               companion = null;
        }
 }