altos: Don't compute filtered average of height error when HAS_ACCEL

[fw/altos] / src / kernel / ao_sample.h

diff --git a/src/kernel/ao_sample.h b/src/kernel/ao_sample.h
index da40187b0d7effd77aff60a49e63518c57e05007..fbef031d46129ab1039b186b7a3885144969e10d 100644 (file)
--- a/src/kernel/ao_sample.h
+++ b/src/kernel/ao_sample.h
@@ -95,7 +95,12 @@ typedef int16_t                      ao_v_t;
 /*
  * Above this speed, baro measurements are unreliable
  */
-#define AO_MAX_BARO_SPEED      200
+#define AO_MAX_BARO_SPEED      248
+
+/* The maximum amount (in a range of 0-256) to de-rate the
+ * baro sensor data based on speed.
+ */
+#define AO_MAX_SPEED_DISTRUST  160
 
 #define ACCEL_NOSE_UP  (ao_accel_2g >> 2)
 
@@ -175,7 +180,9 @@ extern __xdata ao_v_t                       ao_max_height;  /* max of ao_height */
 extern __xdata ao_v_t                  ao_avg_height;  /* running average of height */
 
 extern __pdata ao_v_t                  ao_error_h;
+#if !HAS_ACCEL
 extern __pdata ao_v_t                  ao_error_h_sq_avg;
+#endif
 
 #if HAS_ACCEL
 extern __pdata ao_v_t                  ao_error_a;