altoslib: Add support for TeleMega v4

[fw/altos] / altoslib / AltosFlightSeries.java

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index d130d3adcfa6ae6ca41f38da645c060fbf046b41..3edabfcbfa8b90c7f18b0422c367afdad603becc 100644 (file)
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.util.*;
 
@@ -257,6 +257,15 @@ public class AltosFlightSeries extends AltosDataListener {
 
        public AltosTimeSeries height_series;
 
+       public double max_height = AltosLib.MISSING;
+
+       public  void set_min_pressure(double pa) {
+               double ground_altitude = cal_data().ground_altitude;
+               if (ground_altitude != AltosLib.MISSING)
+                       max_height = AltosConvert.pressure_to_altitude(pa) -
+                               ground_altitude;
+       }
+
        public static final String height_name = "Height";
 
        public  void set_pressure(double pa) {
@@ -382,16 +391,18 @@ public class AltosFlightSeries extends AltosDataListener {
                if (accel_ground_across == AltosLib.MISSING)
                        return;
 
-               if (cal_data().pad_orientation == AltosLib.MISSING)
+               AltosCalData cal_data = cal_data();
+
+               if (cal_data.pad_orientation == AltosLib.MISSING)
                        return;
 
-               if (cal_data().accel_zero_across == AltosLib.MISSING)
+               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);
+               AltosRotation rotation = new AltosRotation(accel_ground_across,
+                                                          accel_ground_through,
+                                                          accel_ground_along,
+                                                          cal_data.pad_orientation);
                double prev_time = ground_time;
 
                orient_series = add_series(orient_name, AltosConvert.orient);