summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-06-26 23:14:13 -0700
committerKeith Packard <keithp@keithp.com>2012-06-26 23:14:13 -0700
commitc4036bf6e7997b618f89a05dd1214c16066ba2b2 (patch)
treef3ebb4af91139da109c493cc7744f8adacb216f6
parentb5f5fd92109ac6f4909a81303d52bc9220cc2520 (diff)
altos: Turn radio-related bits of ao_flight_mm.c
Now that MM has full radio functionality, we can make it work right. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/core/ao_flight_mm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ao_flight_mm.c b/src/core/ao_flight_mm.c
index 28b9869f..a0affc48 100644
--- a/src/core/ao_flight_mm.c
+++ b/src/core/ao_flight_mm.c
@@ -87,7 +87,7 @@ ao_flight(void)
* - pad mode if we're upright,
* - idle mode otherwise
*/
-#if HAS_ACCEL && 0
+#if HAS_ACCEL
if (ao_config.accel_plus_g == 0 ||
ao_config.accel_minus_g == 0 ||
ao_ground_accel < ao_config.accel_plus_g - ACCEL_NOSE_UP ||
@@ -105,14 +105,14 @@ ao_flight(void)
} else
#endif
if (!ao_flight_force_idle
-#if HAS_ACCEL && 0
+#if HAS_ACCEL
&& ao_ground_accel < ao_config.accel_plus_g + ACCEL_NOSE_UP
#endif
)
{
/* Set pad mode - we can fly! */
ao_flight_state = ao_flight_pad;
-#if HAS_USB && HAS_RADIO && 0
+#if HAS_USB && HAS_RADIO
/* Disable the USB controller in flight mode
* to save power
*/