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

[fw/altos] / src / product / ao_telemini.c

diff --git a/src/product/ao_telemini.c b/src/product/ao_telemini.c
index fa23de018c2d5b67abfbda2a57ddf120d809fc60..d9cb676b780db09447cfad71c07e476bbbb874e5 100644 (file)
--- a/src/product/ao_telemini.c
+++ b/src/product/ao_telemini.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,6 +34,19 @@ main(void)
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
 
+       /* A hack -- look at the debug clock pin, if it's sitting at
+        *  ground, then we force the computer to idle mode instead of
+        *  flight mode
+        */
+       if (P2_2 == 0) {
+               ao_flight_force_idle = 1;
+               ao_force_freq = 1;
+               while (P2_2 == 0)
+                       ;
+       }
+
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_cmd_init();
@@ -42,7 +56,7 @@ main(void)
        ao_report_init();
        ao_telemetry_init();
        ao_radio_init();
-       ao_packet_slave_init(TRUE);
+       ao_packet_slave_init(true);
        ao_igniter_init();
        ao_config_init();
        ao_start_scheduler();