projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Switch ao_gps_skytraq and ao_gps_sirf __xdata to __pdata
[fw/altos]
/
src
/
ao_report.c
diff --git
a/src/ao_report.c
b/src/ao_report.c
index 4646fb0982d02258f286ac44a317e89e024c3882..b9dc5bb419979d5d5f960a67f23aa89eba186fad 100644
(file)
--- a/
src/ao_report.c
+++ b/
src/ao_report.c
@@
-78,7
+78,7
@@
ao_report_digit(uint8_t digit) __reentrant
} else {
while (digit--) {
mid(AO_MS_TO_TICKS(200));
} 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));
}
}
pause(AO_MS_TO_TICKS(300));
@@
-87,7
+87,7
@@
ao_report_digit(uint8_t digit) __reentrant
static void
ao_report_altitude(void)
{
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;
__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)
{
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));
}
while (c-- && ao_flight_state == ao_flight_pad)
pause(AO_MS_TO_TICKS(100));
}
+#endif
void
ao_report(void)
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 (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();
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));
__critical {
while (ao_report_state == ao_flight_state)
ao_sleep(DATA_TO_XDATA(&ao_flight_state));