X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_report.c;h=b9dc5bb419979d5d5f960a67f23aa89eba186fad;hp=c9ee7cae05724a1e234cd04fac7f26d5dd0344f5;hb=479bdffa35d0b8d4e48868c8d20f3cb1549521ab;hpb=02611efea0c485d78fad08c696c1f56e868d36b8

diff --git a/src/ao_report.c b/src/ao_report.c
index c9ee7cae..b9dc5bb4 100644
--- a/src/ao_report.c
+++ b/src/ao_report.c
@@ -42,9 +42,9 @@ 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_RED, time)
-#define mid(time)	ao_led_for(AO_LED_RED|AO_LED_GREEN, time)
-#define high(time)	ao_led_for(AO_LED_GREEN, time)
+#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)
 #endif
 #define pause(time)	ao_delay(time)
 
@@ -78,7 +78,7 @@ ao_report_digit(uint8_t digit) __reentrant
 	} else {
 		while (digit--) {
 			mid(AO_MS_TO_TICKS(200));
-			mid(AO_MS_TO_TICKS(200));
+			pause(AO_MS_TO_TICKS(200));
 		}
 	}
 	pause(AO_MS_TO_TICKS(300));
@@ -87,7 +87,7 @@ ao_report_digit(uint8_t digit) __reentrant
 static void
 ao_report_altitude(void)
 {
-	__xdata int16_t	agl = ao_pres_to_altitude(ao_min_pres) - ao_pres_to_altitude(ao_ground_pres);
+	__xdata int16_t	agl = ao_max_height;
 	__xdata uint8_t	digits[10];
 	__xdata uint8_t ndigits, i;
 
@@ -109,6 +109,7 @@ ao_report_altitude(void)
 	}
 }
 
+#if HAS_IGNITE
 static uint8_t
 ao_report_igniter_ready(enum ao_igniter igniter)
 {
@@ -146,6 +147,7 @@ ao_report_continuity(void) __reentrant
 	while (c-- && ao_flight_state == ao_flight_pad)
 		pause(AO_MS_TO_TICKS(100));
 }
+#endif
 
 void
 ao_report(void)
@@ -155,10 +157,12 @@ ao_report(void)
 		if (ao_flight_state == ao_flight_landed)
 			ao_report_altitude();
 		ao_report_beep();
+#if HAS_IGNITE
 		if (ao_flight_state == ao_flight_idle)
 			ao_report_continuity();
 		while (ao_flight_state == ao_flight_pad)
 			ao_report_continuity();
+#endif
 		__critical {
 			while (ao_report_state == ao_flight_state)
 				ao_sleep(DATA_TO_XDATA(&ao_flight_state));