use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / src / ao_flight.c

diff --git a/src/ao_flight.c b/src/ao_flight.c
index af3d6bfa36c2292ecc07e366a6edb7574e4a8df3..85c1825bddfebf68c06f2d2b055c511eddae4164 100644 (file)
--- a/src/ao_flight.c
+++ b/src/ao_flight.c
@@ -54,7 +54,7 @@ __pdata uint8_t                       ao_flight_force_idle;
 /* Landing is detected by getting constant readings from both pressure and accelerometer
  * for a fairly long time (AO_INTERVAL_TICKS)
  */
-#define AO_INTERVAL_TICKS      AO_SEC_TO_TICKS(5)
+#define AO_INTERVAL_TICKS      AO_SEC_TO_TICKS(10)
 
 #define abs(a) ((a) < 0 ? -(a) : (a))
 
@@ -286,7 +286,7 @@ ao_flight(void)
                                ao_interval_max_height = ao_avg_height;
 
                        if ((int16_t) (ao_sample_tick - ao_interval_end) >= 0) {
-                               if (ao_interval_max_height - ao_interval_min_height <= AO_M_TO_HEIGHT(2))
+                               if (ao_interval_max_height - ao_interval_min_height <= AO_M_TO_HEIGHT(4))
                                {
                                        ao_flight_state = ao_flight_landed;