Merge branch 'master' of git://git.gag.com/fw/altos

[fw/altos] / src / ao_telemetrum.c

diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index 0de3572abcd62dbe642ea7216cf7a8310f417a41..fd0adae8f419abd7489ea761dca584be64a32439 100644 (file)
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -16,6 +16,7 @@
  */
 
 #include "ao.h"
+#include "ao_pins.h"
 
 /* stub so as telemetrum doesn't have monitor mode */
 void
@@ -29,10 +30,20 @@ main(void)
 {
        ao_clock_init();
 
+
        /* Turn on the red LED until the system is stable */
-       ao_led_init(AO_LED_RED);
+       ao_led_init(LEDS_AVAILABLE);
        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();
@@ -49,6 +60,9 @@ main(void)
        ao_radio_init();
        ao_packet_slave_init();
        ao_igniter_init();
+#if HAS_DBG
+       ao_dbg_init();
+#endif
        ao_config_init();
        ao_start_scheduler();
 }