move from Debian packaged sdcc to new cc1111 package forked from 2.9.0-5

[fw/altos] / altosui / AltosState.java

diff --git a/altosui/AltosState.java b/altosui/AltosState.java
index 3d8e5e120d184d178e8295d0049ef5c51607bc4a..9c6f85ebb4361cb900f3122ed04bd2b7b0c78492 100644 (file)
--- a/altosui/AltosState.java
+++ b/altosui/AltosState.java
@@ -54,6 +54,9 @@ public class AltosState {
 
        AltosGPS        gps;
 
+       AltosIMU        imu;
+       AltosMag        mag;
+
        double  pad_lat;
        double  pad_lon;
        double  pad_alt;
@@ -107,6 +110,8 @@ public class AltosState {
                        max_acceleration = prev_state.max_acceleration;
                        max_speed = prev_state.max_speed;
                        max_baro_speed = prev_state.max_baro_speed;
+                       imu = prev_state.imu;
+                       mag = prev_state.mag;
 
                        /* make sure the clock is monotonic */
                        while (tick < prev_state.tick)
@@ -135,7 +140,7 @@ public class AltosState {
 
                time = tick / 100.0;
 
-               if (state == Altos.ao_flight_pad || state == Altos.ao_flight_idle) {
+               if (cur.new_gps && (state == Altos.ao_flight_pad || state == Altos.ao_flight_idle)) {
 
                        /* Track consecutive 'good' gps reports, waiting for 10 of them */
                        if (data.gps != null && data.gps.locked && data.gps.nsat >= 4)