altoslib: Remove debug printfs

[fw/altos] / altoslib / AltosFlightStats.java

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index f48e6be6077d8cb5a85b935624c92aa955362195..744c58483b9b692e2e610f72e993a3bb7318099a 100644 (file)
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -30,10 +30,14 @@ public class AltosFlightStats {
        public int[]            state_count = new int[AltosLib.ao_flight_invalid + 1];
        public double[] state_start = new double[AltosLib.ao_flight_invalid + 1];
        public double[] state_end = new double[AltosLib.ao_flight_invalid + 1];
+       public String           product;
+       public String           firmware_version;
        public int              serial;
        public int              flight;
        public int              year, month, day;
        public int              hour, minute, second;
+       public double           boost_time;
+       public double           landed_time;
        public double           lat, lon;
        public double           pad_lat, pad_lon;
        public boolean          has_flight_data;
@@ -67,10 +71,9 @@ public class AltosFlightStats {
 
                if (series.height_series != null) {
                        for (AltosTimeValue height : series.height_series) {
-                               if (height.time >= landed_state_time) {
-                                       landed_height = height.value;
+                               landed_height = height.value;
+                               if (height.time >= landed_state_time)
                                        break;
-                               }
                        }
                }
 
@@ -93,6 +96,9 @@ public class AltosFlightStats {
                                }
                        }
                }
+
+               if (landed_time == AltosLib.MISSING)
+                       landed_time = landed_state_time;
                return landed_time;
        }
 
@@ -116,18 +122,41 @@ public class AltosFlightStats {
                                        break;
                        }
                }
+               if (boost_time == AltosLib.MISSING)
+                       boost_time = boost_state_time;
                return boost_time;
        }
 
 
        public AltosFlightStats(AltosFlightSeries series) {
                AltosCalData    cal_data = series.cal_data;
-               double          boost_time = boost_time(series);
-               double          end_time = 0;
-               double          landed_time = landed_time(series);
 
                series.finish();
 
+               boost_time = boost_time(series);
+               landed_time = landed_time(series);
+
+               if (series.state_series != null){
+                       boolean fixed_boost = false;
+                       boolean fixed_landed = false;
+                       for (AltosTimeValue state : series.state_series) {
+                               if ((int) state.value == AltosLib.ao_flight_boost)
+                                       if (boost_time != AltosLib.MISSING) {
+                                               state.time = boost_time;
+                                               fixed_boost = true;
+                                       }
+                               if ((int) state.value == AltosLib.ao_flight_landed)
+                                       if (landed_time != AltosLib.MISSING) {
+                                               state.time = landed_time;
+                                               fixed_landed = true;
+                                       }
+                       }
+                       if (!fixed_boost && boost_time != AltosLib.MISSING)
+                               series.state_series.add(boost_time, AltosLib.ao_flight_boost);
+                       if (!fixed_landed && landed_time != AltosLib.MISSING)
+                               series.state_series.add(landed_time, AltosLib.ao_flight_landed);
+               }
+
                year = month = day = AltosLib.MISSING;
                hour = minute = second = AltosLib.MISSING;
                serial = flight = AltosLib.MISSING;
@@ -151,6 +180,7 @@ public class AltosFlightStats {
                                state_start[s] = series.state_series.time_of(s);
                        else
                                state_start[s] = AltosLib.MISSING;
+
                        if (s == AltosLib.ao_flight_main)
                                state_end[s] = landed_time;
                        else if (series.state_series != null)
@@ -158,6 +188,11 @@ public class AltosFlightStats {
                        else
                                state_end[s] = AltosLib.MISSING;
 
+                       System.out.printf("state %s start %g end %g\n", AltosLib.state_name(s), state_start[s], state_end[s]);
+
+                       if (state_end[s] > landed_time)
+                               state_end[s] = landed_time;
+
                        if (series.speed_series != null)
                                state_speed[s] = series.speed_series.average(state_start[s], state_end[s]);
 
@@ -165,6 +200,8 @@ public class AltosFlightStats {
                                state_accel[s] = series.accel_series.average(state_start[s], state_end[s]);
                }
 
+               product = cal_data.product;
+               firmware_version = cal_data.firmware_version;
                serial = cal_data.serial;
                flight = cal_data.flight;
 
@@ -197,22 +234,28 @@ public class AltosFlightStats {
 
                max_height = AltosLib.MISSING;
                if (series.height_series != null)
-                       max_height = series.height_series.max();
+                       max_height = series.height_series.max().value;
                max_speed = AltosLib.MISSING;
                if (series.speed_series != null) {
-                       max_speed = series.speed_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
-                       if (max_speed == AltosLib.MISSING)
-                               max_speed = series.speed_series.max();
+                       AltosTimeValue tv = series.speed_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
+                       if (tv == null)
+                               tv = series.speed_series.max();
+                       if (tv != null)
+                               max_speed = tv.value;
                }
                max_acceleration = AltosLib.MISSING;
                if (series.accel_series != null) {
-                       max_acceleration = series.accel_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
-                       if (max_acceleration == AltosLib.MISSING)
-                               max_acceleration = series.accel_series.max();
+                       AltosTimeValue tv = series.accel_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
+                       if (tv == null)
+                               tv = series.accel_series.max();
+                       if (tv != null)
+                               max_acceleration = tv.value;
                }
                max_gps_height = AltosLib.MISSING;
-               if (series.gps_height != null)
-                       max_gps_height = series.gps_height.max();
-
+               if (series.gps_height != null) {
+                       AltosTimeValue tv = series.gps_height.max();
+                       if (tv != null)
+                               max_gps_height = tv.value;
+               }
        }
 }