projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ao_alarm
[fw/altos]
/
src
/
ao_flight.c
diff --git
a/src/ao_flight.c
b/src/ao_flight.c
index be9b3bb6f4cfdbf4e55a9681dac98bbec304b471..c43d0711d571b2d79a3ff41e874b066250ca5c2b 100644
(file)
--- a/
src/ao_flight.c
+++ b/
src/ao_flight.c
@@
-227,6
+227,7
@@
ao_flight(void)
/* Turn on telemetry system
*/
/* Turn on telemetry system
*/
+ ao_rdf_set(1);
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
ao_flight_state = ao_flight_pad;
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
ao_flight_state = ao_flight_pad;
@@
-277,6
+278,9
@@
ao_flight(void)
/* Increase telemetry rate */
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_FLIGHT);
/* Increase telemetry rate */
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_FLIGHT);
+ /* disable RDF beacon */
+ ao_rdf_set(0);
+
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
@@
-438,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));
}
@@
-452,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],