projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos]
/
src
/
ao_telemetrum.c
diff --git
a/src/ao_telemetrum.c
b/src/ao_telemetrum.c
index 5e951b493f098c1a42b787dde12a0635e22f2439..fd0adae8f419abd7489ea761dca584be64a32439 100644
(file)
--- a/
src/ao_telemetrum.c
+++ b/
src/ao_telemetrum.c
@@
-16,16
+16,34
@@
*/
#include "ao.h"
*/
#include "ao.h"
+#include "ao_pins.h"
+
+/* stub so as telemetrum doesn't have monitor mode */
+void
+ao_set_monitor(uint8_t monitoring)
+{
+ (void) monitoring;
+}
void
main(void)
{
ao_clock_init();
void
main(void)
{
ao_clock_init();
+
/* Turn on the red LED until the system is stable */
/* Turn on the red LED until the system is stable */
- ao_led_init(
AO_LED_RED|AO_LED_GREEN
);
+ ao_led_init(
LEDS_AVAILABLE
);
ao_led_on(AO_LED_RED);
ao_led_on(AO_LED_RED);
+ /* A hack -- look at the SPI clock pin, if it's sitting at
+ * ground, then we force the computer to idle mode instead of
+ * flight mode
+ */
+ if (P1_3 == 0) {
+ ao_flight_force_idle = 1;
+ while (P1_3 == 0)
+ ;
+ }
ao_timer_init();
ao_adc_init();
ao_beep_init();
ao_timer_init();
ao_adc_init();
ao_beep_init();
@@
-40,8
+58,11
@@
main(void)
ao_gps_report_init();
ao_telemetry_init();
ao_radio_init();
ao_gps_report_init();
ao_telemetry_init();
ao_radio_init();
+ ao_packet_slave_init();
ao_igniter_init();
ao_igniter_init();
+#if HAS_DBG
ao_dbg_init();
ao_dbg_init();
+#endif
ao_config_init();
ao_start_scheduler();
}
ao_config_init();
ao_start_scheduler();
}