X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_report.c;h=73f87cdd16c05762bdd15933a0a6185c58b4fe64;hp=f22631547473d7de341bff5c91d85107ec8d133f;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hpb=3b5c4d88671e6c511fbfb1ce6b046f558dd6c2bf

diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c
index f2263154..73f87cdd 100644
--- 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
@@ -44,9 +45,16 @@ static const uint8_t flight_reports[] = {
 #define mid(time)	ao_beep_for(AO_BEEP_MID, time)
 #define high(time)	ao_beep_for(AO_BEEP_HIGH, time)
 #else
-#define low(time)	ao_led_for(AO_LED_GREEN, time)
-#define mid(time)	ao_led_for(AO_LED_RED, time)
-#define high(time)	ao_led_for(AO_LED_GREEN|AO_LED_RED, time)
+#ifndef AO_LED_LOW
+#define AO_LED_LOW	AO_LED_GREEN
+#endif
+#ifndef AO_LED_MID
+#define AO_LED_MID	AO_LED_RED
+#endif
+
+#define low(time)	ao_led_for(AO_LED_LOW, time)
+#define mid(time)	ao_led_for(AO_LED_MID, time)
+#define high(time)	ao_led_for(AO_LED_MID|AO_LED_LOW, time)
 #endif
 #define pause(time)	ao_delay(time)
 
@@ -175,7 +183,7 @@ ao_report_battery(void)
 		ao_data_get(&packet);
 		if (packet.adc.v_batt != 0)
 			break;
-		ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+		ao_sleep(&ao_sample_data);
 	}
 	ao_report_number(ao_battery_decivolt(packet.adc.v_batt));
 }
@@ -211,12 +219,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 +254,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 +270,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 +280,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;
+			ao_sleep(&ao_flight_state);
 	}
 }