Enable packet-based communcation to command processor

[fw/altos] / src / ao_flight.c

diff --git a/src/ao_flight.c b/src/ao_flight.c
index 2b062c13fbec8a0a545530015f077a5ad8b8307c..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;
 
                        } 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 */
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        }
                        /* signal successful initialization by turning off the LED */


@@ -360,9 +360,6 @@ ao_flight(void)
                                /* slow down the ADC sample rate */
                                ao_timer_set_adc_interval(10);
 
                                /* slow down the ADC sample rate */
                                ao_timer_set_adc_interval(10);
 

-                               /* Enable RDF beacon */
-                               ao_rdf_set(1);
-

                                /*
                                 * Start recording min/max accel and pres for a while
                                 * to figure out when the rocket has landed
                                /*
                                 * Start recording min/max accel and pres for a while
                                 * to figure out when the rocket has landed


@@ -445,6 +442,8 @@ ao_flight(void)
 
                                /* turn off the ADC capture */
                                ao_timer_set_adc_interval(0);
 
                                /* turn off the ADC capture */
                                ao_timer_set_adc_interval(0);

+                               /* Enable RDF beacon */
+                               ao_rdf_set(1);

 
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        }
 
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        }


@@ -459,7 +458,7 @@ ao_flight(void)
 #define AO_VEL_COUNT_TO_MS(count)      ((int16_t) ((count) / 2700))
 
 static 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],
 {
        printf("STATE: %7s accel: %d speed: %d altitude: %d main: %d\n",
               ao_state_names[ao_flight_state],