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_usb.c __xdata to __pdata
[fw/altos]
/
src
/
ao_ignite.c
diff --git
a/src/ao_ignite.c
b/src/ao_ignite.c
index 798ba9b45ae4fc774e1e793b2e03b304a6068cad..e1b91bea2134628de22d3a59bc74b5a8f2f361ff 100644
(file)
--- a/
src/ao_ignite.c
+++ b/
src/ao_ignite.c
@@
-17,11
+17,21
@@
#include "ao.h"
#include "ao.h"
+#if IGNITE_ON_P2
#define AO_IGNITER_DROGUE P2_3
#define AO_IGNITER_MAIN P2_4
#define AO_IGNITER_DIR P2DIR
#define AO_IGNITER_DROGUE_BIT (1 << 3)
#define AO_IGNITER_MAIN_BIT (1 << 4)
#define AO_IGNITER_DROGUE P2_3
#define AO_IGNITER_MAIN P2_4
#define AO_IGNITER_DIR P2DIR
#define AO_IGNITER_DROGUE_BIT (1 << 3)
#define AO_IGNITER_MAIN_BIT (1 << 4)
+#endif
+
+#if IGNITE_ON_P0
+#define AO_IGNITER_DROGUE P0_5
+#define AO_IGNITER_MAIN P0_4
+#define AO_IGNITER_DIR P0DIR
+#define AO_IGNITER_DROGUE_BIT (1 << 5)
+#define AO_IGNITER_MAIN_BIT (1 << 4)
+#endif
/* test these values with real igniters */
#define AO_IGNITER_OPEN 1000
/* test these values with real igniters */
#define AO_IGNITER_OPEN 1000
@@
-48,8
+58,8
@@
enum ao_igniter_status
ao_igniter_status(enum ao_igniter igniter)
{
__xdata struct ao_adc adc;
ao_igniter_status(enum ao_igniter igniter)
{
__xdata struct ao_adc adc;
- __
x
data int16_t value;
- __
x
data uint8_t request, firing, fired;
+ __
p
data int16_t value;
+ __
p
data uint8_t request, firing, fired;
__critical {
ao_adc_get(&adc);
__critical {
ao_adc_get(&adc);
@@
-133,7
+143,7
@@
ao_ignite_manual(void)
}
}
}
}
-static __code char *igniter_status_names[] = {
+static __code char *
__code
igniter_status_names[] = {
"unknown", "ready", "active", "open"
};
"unknown", "ready", "active", "open"
};
@@
-155,7
+165,7
@@
ao_ignite_test(void)
__code struct ao_cmds ao_ignite_cmds[] = {
{ ao_ignite_manual, "i <key> {main|drogue}\0Fire igniter. <key> is doit with D&I" },
__code struct ao_cmds ao_ignite_cmds[] = {
{ ao_ignite_manual, "i <key> {main|drogue}\0Fire igniter. <key> is doit with D&I" },
- { ao_ignite_test, "t\0Test igniter
continuity
" },
+ { ao_ignite_test, "t\0Test igniter" },
{ 0, NULL },
};
{ 0, NULL },
};