altosui: Max acceleration across boost instead of all ascent

[fw/altos] / altosui / AltosState.java

diff --git a/altosui/AltosState.java b/altosui/AltosState.java
index d374aed8e5d410e32fb34c30c3f291f8ea8e81f9..3d8e5e120d184d178e8295d0049ef5c51607bc4a 100644 (file)
--- a/altosui/AltosState.java
+++ b/altosui/AltosState.java
@@ -28,12 +28,14 @@ public class AltosState {
 
        long    report_time;
 
+       double  time;
        double  time_change;
        int     tick;
 
        int     state;
        boolean landed;
        boolean ascent; /* going up? */
+       boolean boost;  /* under power */
 
        double  ground_altitude;
        double  height;
@@ -48,6 +50,7 @@ public class AltosState {
        double  max_height;
        double  max_acceleration;
        double  max_speed;
+       double  max_baro_speed;
 
        AltosGPS        gps;
 
@@ -71,7 +74,6 @@ public class AltosState {
        int     speak_tick;
        double  speak_altitude;
 
-
        void init (AltosRecord cur, AltosState prev_state) {
                int             i;
                AltosRecord prev;
@@ -104,6 +106,7 @@ public class AltosState {
                        max_height = prev_state.max_height;
                        max_acceleration = prev_state.max_acceleration;
                        max_speed = prev_state.max_speed;
+                       max_baro_speed = prev_state.max_baro_speed;
 
                        /* make sure the clock is monotonic */
                        while (tick < prev_state.tick)
@@ -130,6 +133,8 @@ public class AltosState {
                        time_change = 0;
                }
 
+               time = tick / 100.0;
+
                if (state == Altos.ao_flight_pad || state == Altos.ao_flight_idle) {
 
                        /* Track consecutive 'good' gps reports, waiting for 10 of them */
@@ -162,12 +167,15 @@ public class AltosState {
 
                ascent = (Altos.ao_flight_boost <= state &&
                          state <= Altos.ao_flight_coast);
+               boost = (Altos.ao_flight_boost == state);
 
-               /* Only look at accelerometer data on the way up */
-               if (ascent && acceleration > max_acceleration)
+               /* Only look at accelerometer data under boost */
+               if (boost && acceleration > max_acceleration)
                        max_acceleration = acceleration;
-               if (ascent && speed > max_speed)
+               if (boost && speed > max_speed)
                        max_speed = speed;
+               if (boost && baro_speed > max_baro_speed)
+                       max_baro_speed = baro_speed;
 
                if (height > max_height)
                        max_height = height;