From: Keith Packard <keithp@keithp.com>
Date: Tue, 10 Jul 2012 22:13:18 +0000 (-0700)
Subject: altos: Eliminate compiler warnings when building ao_flight_test
X-Git-Tag: 1.1~117
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6694cedd560a7ea9520ef11472c2770b489187c0

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>
---

diff --git a/src/core/ao_flight.c b/src/core/ao_flight.c
index a0affc48..39084fd0 100644
--- a/src/core/ao_flight.c
+++ b/src/core/ao_flight.c
@@ -48,7 +48,9 @@ __pdata uint16_t		ao_boost_tick;		/* time of launch detect */
 static __data uint16_t		ao_interval_end;
 static __data int16_t		ao_interval_min_height;
 static __data int16_t		ao_interval_max_height;
+#if HAS_ACCEL
 static __data int16_t		ao_coast_avg_accel;
+#endif
 
 __pdata uint8_t			ao_flight_force_idle;
 
@@ -350,7 +352,7 @@ ao_flight(void)
 				ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;
 			}
 			break;
-		case ao_flight_landed:
+		default:
 			break;
 		}
 	}
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