altoslib: Create data file open helper in AltosLib

[fw/altos] / altoslib / AltosCalData.java

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 58d34abeb0e738dca8bcc0964fef69f650f41604..960de30a45f5aeb1f3f89462c3697616559c43bc 100644 (file)
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -182,18 +182,24 @@ public class AltosCalData {
                boost_tick = tick;
        }
 
+       public double           ticks_per_sec = 100.0;
+
+       public void set_ticks_per_sec(double ticks_per_sec) {
+               this.ticks_per_sec = ticks_per_sec;
+       }
+
        public double time() {
                if (tick == AltosLib.MISSING)
                        return AltosLib.MISSING;
                if (boost_tick == AltosLib.MISSING)
                        return AltosLib.MISSING;
-               return (tick - boost_tick) / 100.0;
+               return (tick - boost_tick) / ticks_per_sec;
        }
 
        public double boost_time() {
                if (boost_tick == AltosLib.MISSING)
                        return AltosLib.MISSING;
-               return boost_tick / 100.0;
+               return boost_tick / ticks_per_sec;
        }
 
        public int              state = AltosLib.MISSING;
@@ -204,12 +210,15 @@ public class AltosCalData {
                this.state = state;
        }
 
-       public double           gps_ground_altitude = AltosLib.MISSING;
+       public AltosGPS         gps_pad = null;
 
-       public void set_gps_altitude(double altitude) {
-               if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) ||
-                   gps_ground_altitude == AltosLib.MISSING)
-                       gps_ground_altitude = altitude;
+       public double           gps_pad_altitude = AltosLib.MISSING;
+
+       public void set_gps(AltosGPS gps) {
+               if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
+                       gps_pad = gps;
+               if (gps_pad_altitude == AltosLib.MISSING && gps.alt != AltosLib.MISSING)
+                       gps_pad_altitude = gps.alt;
        }
 
        /*
@@ -217,6 +226,7 @@ public class AltosCalData {
         * object and then deliver the result atomically to the listener
         */
        AltosGPS                temp_gps = null;
+       AltosGPS                prev_gps = null;
        int                     temp_gps_sat_tick = AltosLib.MISSING;
 
        public AltosGPS temp_gps() {
@@ -226,9 +236,10 @@ public class AltosCalData {
        public void reset_temp_gps() {
                if (temp_gps != null) {
                        if (temp_gps.locked && temp_gps.nsat >= 4)
-                               set_gps_altitude(temp_gps.alt);
+                               set_gps(temp_gps);
+                       prev_gps = temp_gps;
+                       temp_gps = null;
                }
-               temp_gps = null;
        }
 
        public boolean gps_pending() {
@@ -237,7 +248,10 @@ public class AltosCalData {
 
        public AltosGPS make_temp_gps(int tick, boolean sats) {
                if (temp_gps == null) {
-                       temp_gps = new AltosGPS();
+                       if (prev_gps != null)
+                               temp_gps = prev_gps.clone();
+                       else
+                               temp_gps = new AltosGPS();
                }
                if (sats) {
                        if (tick != temp_gps_sat_tick)
@@ -335,9 +349,16 @@ public class AltosCalData {
 
        public AltosCalData(AltosConfigData config_data) {
                set_serial(config_data.serial);
+               set_ticks_per_sec(100.0);
                set_flight(config_data.flight);
                set_callsign(config_data.callsign);
+               set_config(config_data.config_major, config_data.config_minor, config_data.flight_log_max);
+               set_firmware_version(config_data.version);
+               set_flight_params(config_data.apogee_delay / ticks_per_sec, config_data.apogee_lockout / ticks_per_sec);
+               set_pad_orientation(config_data.pad_orientation);
+               set_product(config_data.product);
                set_accel_plus_minus(config_data.accel_cal_plus, config_data.accel_cal_minus);
+               set_accel_zero(config_data.accel_zero_along, config_data.accel_zero_across, config_data.accel_zero_through);
                set_ms5607(config_data.ms5607);
                try {
                        set_mma655x_inverted(config_data.mma655x_inverted());