projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/simple-quiet' into multiarch
[fw/altos]
/
src
/
core
/
ao_report.c
diff --git
a/src/core/ao_report.c
b/src/core/ao_report.c
index e0355d96b75cde650c54f0974084ab0fbda63910..70f0b49d1174058fbbb9401b8ca582cbc145f3d9 100644
(file)
--- a/
src/core/ao_report.c
+++ b/
src/core/ao_report.c
@@
-119,7
+119,13
@@
ao_report_igniter_ready(enum ao_igniter igniter)
static void
ao_report_continuity(void) __reentrant
{
static void
ao_report_continuity(void) __reentrant
{
- uint8_t c = (ao_report_igniter_ready(ao_igniter_drogue) |
+ uint8_t c;
+
+#if !HAS_IGNITE
+ if (!ao_igniter_present)
+ return;
+#endif
+ c = (ao_report_igniter_ready(ao_igniter_drogue) |
(ao_report_igniter_ready(ao_igniter_main) << 1));
if (c) {
while (c--) {
(ao_report_igniter_ready(ao_igniter_main) << 1));
if (c) {
while (c--) {
@@
-145,9
+151,6
@@
ao_report_continuity(void) __reentrant
}
}
#endif
}
}
#endif
- c = 50;
- while (c-- && ao_flight_state == ao_flight_pad)
- pause(AO_MS_TO_TICKS(100));
}
#endif
}
#endif
@@
-162,8
+165,13
@@
ao_report(void)
#if HAS_IGNITE_REPORT
if (ao_flight_state == ao_flight_idle)
ao_report_continuity();
#if HAS_IGNITE_REPORT
if (ao_flight_state == ao_flight_idle)
ao_report_continuity();
- while (ao_flight_state == ao_flight_pad)
+ while (ao_flight_state == ao_flight_pad) {
+ uint8_t c;
ao_report_continuity();
ao_report_continuity();
+ c = 50;
+ while (c-- && ao_flight_state == ao_flight_pad)
+ pause(AO_MS_TO_TICKS(100));
+ }
#endif
__critical {
while (ao_report_state == ao_flight_state)
#endif
__critical {
while (ao_report_state == ao_flight_state)