Merge branch 'master' into new-state

[fw/altos] / altoslib / AltosRecord.java

diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index 07e910eb726e53fb28471521035f7f0a68b7665b..0c8e1db9f1c9def66f8c186033cf3e65632be246 100644 (file)
--- a/altoslib/AltosRecord.java
+++ b/altoslib/AltosRecord.java
@@ -44,7 +44,7 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
        public int      tick;
 
        public AltosGPS gps;
-       public boolean  new_gps;
+       public int      gps_sequence;
 
        public double   time;   /* seconds since boost */
 
@@ -56,6 +56,10 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
        public int      flight_log_max;
        public String   firmware_version;
 
+       public double   accel_plus_g, accel_minus_g;
+       public double   ground_accel;
+       public double   accel;
+
        public AltosRecordCompanion companion;
 
        /* Telemetry sources have these values recorded from the flight computer */
@@ -143,7 +147,7 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
                state = old.state;
                tick = old.tick;
                gps = new AltosGPS(old.gps);
-               new_gps = old.new_gps;
+               gps_sequence = old.gps_sequence;
                companion = old.companion;
                kalman_acceleration = old.kalman_acceleration;
                kalman_speed = old.kalman_speed;
@@ -161,11 +165,15 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
                state = AltosLib.ao_flight_startup;
                tick = 0;
                gps = null;
-               new_gps = false;
+               gps_sequence = 0;
                companion = null;
 
                kalman_acceleration = MISSING;
                kalman_speed = MISSING;
                kalman_height = MISSING;
+
+               accel_plus_g = MISSING;
+               accel_minus_g = MISSING;
+               
        }
 }