use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosState.java

diff --git a/altosui/AltosState.java b/altosui/AltosState.java
index 1ac816d52f842f594e9b378b003ba8a59754e907..072cb790bfb1161b5d11d2d6c9f86c5ae560185d 100644 (file)
--- a/altosui/AltosState.java
+++ b/altosui/AltosState.java
@@ -49,6 +49,7 @@ public class AltosState {
        double  max_height;
        double  max_acceleration;
        double  max_speed;
        double  max_height;
        double  max_acceleration;
        double  max_speed;

+       double  max_baro_speed;

 
        AltosGPS        gps;
 
 
        AltosGPS        gps;
 


@@ -72,7 +73,6 @@ public class AltosState {
        int     speak_tick;
        double  speak_altitude;
 
        int     speak_tick;
        double  speak_altitude;
 

-

        void init (AltosRecord cur, AltosState prev_state) {
                int             i;
                AltosRecord prev;
        void init (AltosRecord cur, AltosState prev_state) {
                int             i;
                AltosRecord prev;


@@ -105,6 +105,7 @@ public class AltosState {
                        max_height = prev_state.max_height;
                        max_acceleration = prev_state.max_acceleration;
                        max_speed = prev_state.max_speed;
                        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)
 
                        /* make sure the clock is monotonic */
                        while (tick < prev_state.tick)


@@ -171,6 +172,8 @@ public class AltosState {
                        max_acceleration = acceleration;
                if (ascent && speed > max_speed)
                        max_speed = speed;
                        max_acceleration = acceleration;
                if (ascent && speed > max_speed)
                        max_speed = speed;

+               if (ascent && baro_speed > max_baro_speed)
+                       max_baro_speed = baro_speed;

 
                if (height > max_height)
                        max_height = height;
 
                if (height > max_height)
                        max_height = height;