Switch from GPLv2 to GPLv2+

[fw/altos] / src / kernel / ao_report.c

diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c
index f22631547473d7de341bff5c91d85107ec8d133f..6592d6168988270cd3cd88d28d1cb1572b1fbc68 100644 (file)
--- a/src/kernel/ao_report.c
+++ b/src/kernel/ao_report.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
@@ -211,12 +212,23 @@ ao_report_continuity(void) __reentrant
                        pause(AO_MS_TO_TICKS(100));
                }
        } else {
-               c = 10;
+               c = 5;
                while (c--) {
                        high(AO_MS_TO_TICKS(20));
                        low(AO_MS_TO_TICKS(20));
                }
        }
+#if AO_PYRO_NUM
+       pause(AO_MS_TO_TICKS(250));
+       for(c = 0; c < AO_PYRO_NUM; c++) {
+               enum ao_igniter_status  status = ao_pyro_status(c);
+               if (status == ao_igniter_ready)
+                       mid(AO_MS_TO_TICKS(25));
+               else
+                       low(AO_MS_TO_TICKS(25));
+               pause(AO_MS_TO_TICKS(200));
+       }
+#endif
 #if HAS_LOG
        if (ao_log_full()) {
                pause(AO_MS_TO_TICKS(100));
@@ -235,15 +247,15 @@ ao_report_continuity(void) __reentrant
 void
 ao_report(void)
 {
-       ao_report_state = ao_flight_state;
        for(;;) {
+               ao_report_state = ao_flight_state;
 #if HAS_BATTERY_REPORT
-               if (ao_flight_state == ao_flight_startup)
+               if (ao_report_state == ao_flight_startup)
                        ao_report_battery();
                else
 #endif
                        ao_report_beep();
-               if (ao_flight_state == ao_flight_landed) {
+               if (ao_report_state == ao_flight_landed) {
                        ao_report_altitude();
 #if HAS_FLIGHT
                        ao_delay(AO_SEC_TO_TICKS(5));
@@ -251,7 +263,7 @@ ao_report(void)
 #endif
                }
 #if HAS_IGNITE_REPORT
-               if (ao_flight_state == ao_flight_idle)
+               if (ao_report_state == ao_flight_idle)
                        ao_report_continuity();
                while (ao_flight_state == ao_flight_pad) {
                        uint8_t c;
@@ -261,10 +273,8 @@ ao_report(void)
                                pause(AO_MS_TO_TICKS(100));
                }
 #endif
-
                while (ao_report_state == ao_flight_state)
                        ao_sleep(DATA_TO_XDATA(&ao_flight_state));
-               ao_report_state = ao_flight_state;
        }
 }