summaryrefslogtreecommitdiff
path: root/src/core/ao_kalman.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-07-10 15:13:18 -0700
committerKeith Packard <keithp@keithp.com>2012-07-10 15:13:18 -0700
commit6694cedd560a7ea9520ef11472c2770b489187c0 (patch)
tree4627d40ac33389f084a8979a30c95b6dee65e7bb /src/core/ao_kalman.c
parent1ae3f467a1d7be2fc3b1a45ba12568a3a25a0099 (diff)
altos: Eliminate compiler warnings when building ao_flight_test
We turn on a pile of warnings for that. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/core/ao_kalman.c')
-rw-r--r--src/core/ao_kalman.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/ao_kalman.c b/src/core/ao_kalman.c
index 68725f69..59ffd8b2 100644
--- a/src/core/ao_kalman.c
+++ b/src/core/ao_kalman.c
@@ -172,6 +172,7 @@ ao_kalman_err_accel(void)
ao_error_a = (accel - ao_k_accel) >> 16;
}
+#ifndef FORCE_ACCEL
static void
ao_kalman_correct_both(void)
{
@@ -242,7 +243,8 @@ ao_kalman_correct_both(void)
(int32_t) AO_BOTH_K21_100 * ao_error_a;
}
-#ifdef FORCE_ACCEL
+#else
+
static void
ao_kalman_correct_accel(void)
{
@@ -258,7 +260,8 @@ ao_kalman_correct_accel(void)
ao_k_speed += (int32_t) AO_ACCEL_K1_100 * ao_error_a;
ao_k_accel += (int32_t) AO_ACCEL_K2_100 * ao_error_a;
}
-#endif
+
+#endif /* else FORCE_ACCEL */
#endif /* HAS_ACCEL */
void