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 a0affc4868f028dd61ccea1b86c0ac863e404623..39084fd0fa2cad5d2078a45a0ac1231cfd05108f 100644 (file)
--- 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 68725f6978bf4c9cf3dc45b9ae97065624dde3ae..59ffd8b27267f24c7165fb835d24815ba4af7907 100644 (file)
--- 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