altoslib: Compute 'vertical acceleration' for eeprom files
[fw/altos] / altoslib / AltosFlightSeries.java
index 7bedf38903eeadb209cc7616220a02a049795c45..315e0a44d6fbd39924d5168acd9df53f844dc1d0 100644 (file)
@@ -18,7 +18,10 @@ import java.util.*;
 
 public class AltosFlightSeries extends AltosDataListener {
 
-       public ArrayList<AltosTimeSeries> series;
+       public ArrayList<AltosTimeSeries> series = new ArrayList<AltosTimeSeries>();
+
+       public double   speed_filter_width = 4.0;
+       public double   accel_filter_width = 4.0;
 
        public int[] indices() {
                int[] indices = new int[series.size()];
@@ -86,6 +89,14 @@ public class AltosFlightSeries extends AltosDataListener {
                return AltosLib.MISSING;
        }
 
+       public double value(String name, double time) {
+               for (AltosTimeSeries s : series) {
+                       if (s.label.equals(name))
+                               return s.value(time);
+               }
+               return AltosLib.MISSING;
+       }
+
        public double value_before(String name, double time) {
                for (AltosTimeSeries s : series) {
                        if (s.label.equals(name))
@@ -127,11 +138,15 @@ public class AltosFlightSeries extends AltosDataListener {
                return false;
        }
 
-       AltosTimeSeries state_series;
+       public AltosTimeSeries state_series;
 
        public static final String state_name = "State";
 
        public void set_state(int state) {
+
+               if (state == AltosLib.ao_flight_pad)
+                       return;
+
                if (state_series == null)
                        state_series = add_series(state_name, AltosConvert.state_name);
                else if (this.state == state)
@@ -140,14 +155,20 @@ public class AltosFlightSeries extends AltosDataListener {
                state_series.add(time(), state);
        }
 
-       AltosTimeSeries accel_series;
+       public AltosTimeSeries  accel_series;
 
        public static final String accel_name = "Accel";
 
+       public AltosTimeSeries  vert_accel_series;
+
+       public static final String vert_accel_name = "Vertical Accel";
+
        public void set_acceleration(double acceleration) {
-               if (accel_series == null) {
+               if (acceleration == AltosLib.MISSING)
+                       return;
+               if (accel_series == null)
                        accel_series = add_series(accel_name, AltosConvert.accel);
-               }
+
                accel_series.add(time(), acceleration);
        }
 
@@ -156,21 +177,21 @@ public class AltosFlightSeries extends AltosDataListener {
                        return;
 
                if (speed_series != null) {
-                       AltosTimeSeries temp_series = make_series(accel_name, AltosConvert.accel);
-                       speed_series.differentiate(temp_series);
+                       AltosTimeSeries temp_series = make_series(speed_name, AltosConvert.speed);
+                       speed_series.filter(temp_series, accel_filter_width);
                        accel_series = add_series(accel_name, AltosConvert.accel);
-                       temp_series.filter(accel_series, 0.25);
+                       temp_series.differentiate(accel_series);
                }
        }
 
        public void set_received_time(long received_time) {
        }
 
-       AltosTimeSeries rssi_series;
+       public AltosTimeSeries rssi_series;
 
        public static final String rssi_name = "RSSI";
 
-       AltosTimeSeries status_series;
+       public AltosTimeSeries status_series;
 
        public static final String status_name = "Radio Status";
 
@@ -183,38 +204,52 @@ public class AltosFlightSeries extends AltosDataListener {
                status_series.add(time(), status);
        }
 
-       AltosTimeSeries pressure_series;
+       public AltosTimeSeries pressure_series;
 
        public static final String pressure_name = "Pressure";
 
-       AltosTimeSeries altitude_series;
+       public AltosTimeSeries altitude_series;
 
        public static final String altitude_name = "Altitude";
 
-       AltosTimeSeries height_series;
+       public AltosTimeSeries height_series;
 
        public static final String height_name = "Height";
 
        public  void set_pressure(double pa) {
+               if (pa == AltosLib.MISSING)
+                       return;
+
                if (pressure_series == null)
                        pressure_series = add_series(pressure_name, AltosConvert.pressure);
                pressure_series.add(time(), pa);
                if (altitude_series == null)
                        altitude_series = add_series(altitude_name, AltosConvert.height);
 
+               if (cal_data.ground_pressure == AltosLib.MISSING)
+                       cal_data.set_ground_pressure(pa);
+
                double altitude = AltosConvert.pressure_to_altitude(pa);
                altitude_series.add(time(), altitude);
        }
 
-       private void compute_height(double ground_altitude) {
-               if (height_series == null) {
+       private void compute_height() {
+               double ground_altitude = cal_data.ground_altitude;
+               if (height_series == null && ground_altitude != AltosLib.MISSING && altitude_series != null) {
                        height_series = add_series(height_name, AltosConvert.height);
                        for (AltosTimeValue alt : altitude_series)
                                height_series.add(alt.time, alt.value - ground_altitude);
                }
+
+               if (gps_height == null && cal_data.gps_pad != null && cal_data.gps_pad.alt != AltosLib.MISSING && gps_altitude != null) {
+                       double gps_ground_altitude = cal_data.gps_pad.alt;
+                       gps_height = add_series(gps_height_name, AltosConvert.height);
+                       for (AltosTimeValue gps_alt : gps_altitude)
+                               gps_height.add(gps_alt.time, gps_alt.value - gps_ground_altitude);
+               }
        }
 
-       AltosTimeSeries speed_series;
+       public AltosTimeSeries speed_series;
 
        public static final String speed_name = "Speed";
 
@@ -226,15 +261,32 @@ public class AltosFlightSeries extends AltosDataListener {
                AltosTimeSeries accel_speed_series = null;
 
                if (altitude_series != null) {
-                       AltosTimeSeries temp_series = make_series(speed_name, AltosConvert.speed);
-                       altitude_series.differentiate(temp_series);
+                       AltosTimeSeries temp_series = make_series(altitude_name, AltosConvert.height);
+                       altitude_series.filter(temp_series, speed_filter_width);
 
                        alt_speed_series = make_series(speed_name, AltosConvert.speed);
-                       temp_series.filter(alt_speed_series, 10.0);
+                       temp_series.differentiate(alt_speed_series);
                }
                if (accel_series != null) {
+
+                       if (orient_series != null) {
+                               vert_accel_series = add_series(vert_accel_name, AltosConvert.accel);
+
+                               for (AltosTimeValue a : accel_series) {
+                                       double  orient = orient_series.value(a.time);
+                                       double  a_abs = a.value + AltosConvert.gravity;
+                                       double  v_a = a_abs * Math.cos(AltosConvert.degrees_to_radians(orient)) - AltosConvert.gravity;
+
+                                       vert_accel_series.add(a.time, v_a);
+                               }
+                       }
+
                        AltosTimeSeries temp_series = make_series(speed_name, AltosConvert.speed);
-                       accel_series.integrate(temp_series);
+
+                       if (vert_accel_series != null)
+                               vert_accel_series.integrate(temp_series);
+                       else
+                               accel_series.integrate(temp_series);
 
                        accel_speed_series = make_series(speed_name, AltosConvert.speed);
                        temp_series.filter(accel_speed_series, 0.1);
@@ -273,7 +325,50 @@ public class AltosFlightSeries extends AltosDataListener {
                        add_series(speed_series);
        }
 
-       AltosTimeSeries kalman_height_series, kalman_speed_series, kalman_accel_series;
+       public AltosTimeSeries orient_series;
+
+       public static final String orient_name = "Tilt Angle";
+
+       private void compute_orient() {
+
+               if (orient_series != null)
+                       return;
+
+               if (accel_ground_across == AltosLib.MISSING)
+                       return;
+
+               if (cal_data.pad_orientation == AltosLib.MISSING)
+                       return;
+
+               if (cal_data.accel_zero_across == AltosLib.MISSING)
+                       return;
+
+               AltosRotation rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data.accel_zero_across),
+                                                          AltosIMU.convert_accel(accel_ground_through - cal_data.accel_zero_through),
+                                                          AltosIMU.convert_accel(accel_ground_along - cal_data.accel_zero_along),
+                                                          cal_data.pad_orientation);
+               double prev_time = ground_time;
+
+               orient_series = add_series(orient_name, AltosConvert.orient);
+               orient_series.add(ground_time, rotation.tilt());
+
+               for (AltosTimeValue roll_v : gyro_roll) {
+                       double  time = roll_v.time;
+                       double  dt = time - prev_time;
+
+                       if (dt > 0) {
+                               double  roll = AltosConvert.degrees_to_radians(roll_v.value);
+                               double  pitch = AltosConvert.degrees_to_radians(gyro_pitch.value(time));
+                               double  yaw = AltosConvert.degrees_to_radians(gyro_yaw.value(time));
+
+                               rotation.rotate(dt, pitch, yaw, roll);
+                               orient_series.add(time, rotation.tilt());
+                       }
+                       prev_time = time;
+               }
+       }
+
+       public AltosTimeSeries  kalman_height_series, kalman_speed_series, kalman_accel_series;
 
        public static final String kalman_height_name = "Kalman Height";
        public static final String kalman_speed_name = "Kalman Speed";
@@ -290,7 +385,7 @@ public class AltosFlightSeries extends AltosDataListener {
                kalman_accel_series.add(time(), acceleration);
        }
 
-       AltosTimeSeries thrust_series;
+       public AltosTimeSeries thrust_series;
 
        public static final String thrust_name = "Thrust";
 
@@ -300,7 +395,7 @@ public class AltosFlightSeries extends AltosDataListener {
                thrust_series.add(time(), N);
        }
 
-       AltosTimeSeries temperature_series;
+       public AltosTimeSeries temperature_series;
 
        public static final String temperature_name = "Temperature";
 
@@ -310,7 +405,7 @@ public class AltosFlightSeries extends AltosDataListener {
                temperature_series.add(time(), deg_c);
        }
 
-       AltosTimeSeries battery_voltage_series;
+       public AltosTimeSeries battery_voltage_series;
 
        public static final String battery_voltage_name = "Battery Voltage";
 
@@ -322,7 +417,7 @@ public class AltosFlightSeries extends AltosDataListener {
                battery_voltage_series.add(time(), volts);
        }
 
-       AltosTimeSeries apogee_voltage_series;
+       public AltosTimeSeries apogee_voltage_series;
 
        public static final String apogee_voltage_name = "Apogee Voltage";
 
@@ -334,7 +429,7 @@ public class AltosFlightSeries extends AltosDataListener {
                apogee_voltage_series.add(time(), volts);
        }
 
-       AltosTimeSeries main_voltage_series;
+       public AltosTimeSeries main_voltage_series;
 
        public static final String main_voltage_name = "Main Voltage";
 
@@ -358,15 +453,15 @@ public class AltosFlightSeries extends AltosDataListener {
                return gps;
        }
 
-       AltosTimeSeries sats_in_view;
-       AltosTimeSeries sats_in_soln;
-       AltosTimeSeries gps_altitude;
-       AltosTimeSeries gps_height;
-       AltosTimeSeries gps_ground_speed;
-       AltosTimeSeries gps_ascent_rate;
-       AltosTimeSeries gps_course;
-       AltosTimeSeries gps_speed;
-       AltosTimeSeries gps_pdop, gps_vdop, gps_hdop;
+       public AltosTimeSeries  sats_in_view;
+       public AltosTimeSeries sats_in_soln;
+       public AltosTimeSeries gps_altitude;
+       public AltosTimeSeries gps_height;
+       public AltosTimeSeries gps_ground_speed;
+       public AltosTimeSeries gps_ascent_rate;
+       public AltosTimeSeries gps_course;
+       public AltosTimeSeries gps_speed;
+       public AltosTimeSeries gps_pdop, gps_vdop, gps_hdop;
 
        public static final String sats_in_view_name = "Satellites in view";
        public static final String sats_in_soln_name = "Satellites in solution";
@@ -390,38 +485,47 @@ public class AltosFlightSeries extends AltosDataListener {
                }
                sats_in_soln.add(time(), gps.nsat);
                if (gps.pdop != AltosLib.MISSING) {
-                       if (gps_pdop == null) {
+                       if (gps_pdop == null)
                                gps_pdop = add_series(gps_pdop_name, null);
-                               gps_hdop = add_series(gps_hdop_name, null);
-                               gps_vdop = add_series(gps_vdop_name, null);
-                       }
                        gps_pdop.add(time(), gps.pdop);
+               }
+               if (gps.hdop != AltosLib.MISSING) {
+                       if (gps_hdop == null)
+                               gps_hdop = add_series(gps_hdop_name, null);
                        gps_hdop.add(time(), gps.hdop);
+               }
+               if (gps.vdop != AltosLib.MISSING) {
+                       if (gps_vdop == null)
+                               gps_vdop = add_series(gps_vdop_name, null);
                        gps_vdop.add(time(), gps.vdop);
                }
                if (gps.locked) {
-                       if (gps_altitude == null) {
-                               gps_altitude = add_series(gps_altitude_name, AltosConvert.height);
-                               gps_height = add_series(gps_height_name, AltosConvert.height);
-                               gps_ground_speed = add_series(gps_ground_speed_name, AltosConvert.speed);
-                               gps_ascent_rate = add_series(gps_ascent_rate_name, AltosConvert.speed);
-                               gps_course = add_series(gps_course_name, null);
-                               gps_speed = add_series(gps_speed_name, null);
-                       }
                        if (gps.alt != AltosLib.MISSING) {
+                               if (gps_altitude == null)
+                                       gps_altitude = add_series(gps_altitude_name, AltosConvert.height);
                                gps_altitude.add(time(), gps.alt);
-                               if (cal_data.gps_pad != null)
-                                       gps_height.add(time(), gps.alt - cal_data.gps_pad.alt);
                        }
-                       if (gps.ground_speed != AltosLib.MISSING)
+                       if (gps.ground_speed != AltosLib.MISSING) {
+                               if (gps_ground_speed == null)
+                                       gps_ground_speed = add_series(gps_ground_speed_name, AltosConvert.speed);
                                gps_ground_speed.add(time(), gps.ground_speed);
-                       if (gps.climb_rate != AltosLib.MISSING)
+                       }
+                       if (gps.climb_rate != AltosLib.MISSING) {
+                               if (gps_ascent_rate == null)
+                                       gps_ascent_rate = add_series(gps_ascent_rate_name, AltosConvert.speed);
                                gps_ascent_rate.add(time(), gps.climb_rate);
-                       if (gps.course != AltosLib.MISSING)
+                       }
+                       if (gps.course != AltosLib.MISSING) {
+                               if (gps_course == null)
+                                       gps_course = add_series(gps_course_name, null);
                                gps_course.add(time(), gps.course);
-                       if (gps.ground_speed != AltosLib.MISSING && gps.climb_rate != AltosLib.MISSING)
+                       }
+                       if (gps.ground_speed != AltosLib.MISSING && gps.climb_rate != AltosLib.MISSING) {
+                               if (gps_speed == null)
+                                       gps_speed = add_series(gps_speed_name, null);
                                gps_speed.add(time(), Math.sqrt(gps.ground_speed * gps.ground_speed +
                                                                gps.climb_rate * gps.climb_rate));
+                       }
                }
                if (gps.cc_gps_sat != null) {
                        if (sats_in_view == null)
@@ -434,19 +538,19 @@ public class AltosFlightSeries extends AltosDataListener {
        public static final String accel_across_name = "Accel Across";
        public static final String accel_through_name = "Accel Through";
 
-       AltosTimeSeries accel_along, accel_across, accel_through;
+       public AltosTimeSeries accel_along, accel_across, accel_through;
 
        public static final String gyro_roll_name = "Roll Rate";
        public static final String gyro_pitch_name = "Pitch Rate";
        public static final String gyro_yaw_name = "Yaw Rate";
 
-       AltosTimeSeries gyro_roll, gyro_pitch, gyro_yaw;
+       public AltosTimeSeries gyro_roll, gyro_pitch, gyro_yaw;
 
        public static final String mag_along_name = "Magnetic Field Along";
        public static final String mag_across_name = "Magnetic Field Across";
        public static final String mag_through_name = "Magnetic Field Through";
 
-       AltosTimeSeries mag_along, mag_across, mag_through;
+       public AltosTimeSeries mag_along, mag_across, mag_through;
 
        public  void set_accel(double along, double across, double through) {
                if (accel_along == null) {
@@ -459,7 +563,17 @@ public class AltosFlightSeries extends AltosDataListener {
                accel_through.add(time(), through);
        }
 
+       private double  accel_ground_along = AltosLib.MISSING;
+       private double  accel_ground_across = AltosLib.MISSING;
+       private double  accel_ground_through = AltosLib.MISSING;
+
+       private double          ground_time;
+
        public  void set_accel_ground(double along, double across, double through) {
+               accel_ground_along = along;
+               accel_ground_across = across;
+               accel_ground_through = through;
+               ground_time = time();
        }
 
        public  void set_gyro(double roll, double pitch, double yaw) {
@@ -484,10 +598,6 @@ public class AltosFlightSeries extends AltosDataListener {
                mag_through.add(time(), through);
        }
 
-       public static final String orient_name = "Tilt Angle";
-
-       AltosTimeSeries orient_series;
-
        public void set_orient(double orient) {
                if (orient_series == null)
                        orient_series = add_series(orient_name, AltosConvert.orient);
@@ -496,7 +606,7 @@ public class AltosFlightSeries extends AltosDataListener {
 
        public static final String pyro_voltage_name = "Pyro Voltage";
 
-       AltosTimeSeries pyro_voltage;
+       public AltosTimeSeries pyro_voltage;
 
        public  void set_pyro_voltage(double volts) {
                if (pyro_voltage == null)
@@ -522,7 +632,7 @@ public class AltosFlightSeries extends AltosDataListener {
                return igniter_voltage_names[channel];
        }
 
-       AltosTimeSeries[] igniter_voltage;
+       public AltosTimeSeries[] igniter_voltage;
 
        public  void set_igniter_voltage(double[] voltage) {
                int channels = voltage.length;
@@ -544,7 +654,7 @@ public class AltosFlightSeries extends AltosDataListener {
 
        public static final String pyro_fired_name = "Pyro Channel State";
 
-       AltosTimeSeries pyro_fired_series;
+       public AltosTimeSeries pyro_fired_series;
 
        int     last_pyro_mask;
 
@@ -563,25 +673,19 @@ public class AltosFlightSeries extends AltosDataListener {
        public void set_companion(AltosCompanion companion) {
        }
 
-       public void fill_in() {
+       public void finish() {
+               compute_orient();
                compute_speed();
                compute_accel();
-               if (cal_data.ground_altitude != AltosLib.MISSING)
-                       compute_height(cal_data.ground_altitude);
-       }
-
-       public void init() {
-               time = AltosLib.MISSING;
-               series = new ArrayList<AltosTimeSeries>();
+               compute_height();
        }
 
        public AltosTimeSeries[] series() {
-               fill_in();
+               finish();
                return series.toArray(new AltosTimeSeries[0]);
        }
 
        public AltosFlightSeries(AltosCalData cal_data) {
                super(cal_data);
-               init();
        }
 }