projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add task queues.
[fw/altos]
/
src
/
core
/
ao_report.c
diff --git
a/src/core/ao_report.c
b/src/core/ao_report.c
index 7c9287928e28a5cdbd5ac8b6bce75a48594c88ee..1104cd82532ff8173334591ee06c534b968e1f42 100644
(file)
--- a/
src/core/ao_report.c
+++ b/
src/core/ao_report.c
@@
-16,6
+16,8
@@
*/
#include "ao.h"
*/
#include "ao.h"
+#include <ao_flight.h>
+#include <ao_sample.h>
#define BIT(i,x) ((x) ? (1 << (i)) : 0)
#define MORSE1(a) (1 | BIT(3,a))
#define BIT(i,x) ((x) ? (1 << (i)) : 0)
#define MORSE1(a) (1 | BIT(3,a))
@@
-112,6
+114,13
@@
ao_report_igniter_ready(enum ao_igniter igniter)
return ao_igniter_status(igniter) == ao_igniter_ready ? 1 : 0;
}
return ao_igniter_status(igniter) == ao_igniter_ready ? 1 : 0;
}
+uint8_t
+ao_report_igniter(void)
+{
+ return (ao_report_igniter_ready(ao_igniter_drogue) |
+ (ao_report_igniter_ready(ao_igniter_main) << 1));
+}
+
static void
ao_report_continuity(void) __reentrant
{
static void
ao_report_continuity(void) __reentrant
{
@@
-121,8
+130,7
@@
ao_report_continuity(void) __reentrant
if (!ao_igniter_present)
return;
#endif
if (!ao_igniter_present)
return;
#endif
- c = (ao_report_igniter_ready(ao_igniter_drogue) |
- (ao_report_igniter_ready(ao_igniter_main) << 1));
+ c = ao_report_igniter();
if (c) {
while (c--) {
high(AO_MS_TO_TICKS(25));
if (c) {
while (c--) {
high(AO_MS_TO_TICKS(25));