Merge remote branch 'origin/master' into skytraq

[fw/altos] / src / ao_flight.c

diff --git a/src/ao_flight.c b/src/ao_flight.c
index ec89e7c2f7e97bdbbb850ead7f1015b1e45e83f1..e91a5daa74c97cc77f03b6d3030657c6f061a45e 100644 (file)
--- a/src/ao_flight.c
+++ b/src/ao_flight.c
@@ -235,9 +235,9 @@ ao_flight(void)
                        } else {
                                ao_flight_state = ao_flight_idle;
 
-                               /* Turn on the Green LED in idle mode
+                               /* Turn on packet system in idle mode
                                 */
-                               ao_led_on(AO_LED_GREEN);
+                               ao_packet_slave_start();
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        }
                        /* signal successful initialization by turning off the LED */
@@ -458,7 +458,7 @@ ao_flight(void)
 #define AO_VEL_COUNT_TO_MS(count)      ((int16_t) ((count) / 2700))
 
 static void
-ao_flight_status(void)
+ao_flight_status(void) __reentrant
 {
        printf("STATE: %7s accel: %d speed: %d altitude: %d main: %d\n",
               ao_state_names[ao_flight_state],