X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_ignite.c;h=e1b91bea2134628de22d3a59bc74b5a8f2f361ff;hb=9ba0da9247ea424a7a147aa85daae0d5e6316b81;hp=603fcd25f3e37105487ad1005894cfdbabcc9815;hpb=69290588980bb15732a99eca5c911a3b6e9a37b9;p=fw%2Faltos

diff --git a/src/ao_ignite.c b/src/ao_ignite.c
index 603fcd25..e1b91bea 100644
--- a/src/ao_ignite.c
+++ b/src/ao_ignite.c
@@ -17,11 +17,21 @@
 
 #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)
+#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
@@ -48,8 +58,8 @@ enum ao_igniter_status
 ao_igniter_status(enum ao_igniter igniter)
 {
 	__xdata struct ao_adc adc;
-	__xdata int16_t value;
-	__xdata uint8_t request, firing, fired;
+	__pdata int16_t value;
+	__pdata uint8_t request, firing, fired;
 
 	__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"
 };
 
@@ -154,9 +164,9 @@ ao_ignite_test(void)
 }
 
 __code struct ao_cmds ao_ignite_cmds[] = {
-	{ 'i',	ao_ignite_manual,	"i <key> {main|drogue}              Fire igniter. <key> is doit with D&I" },
-	{ 't',  ao_ignite_test,		"t                                  Test igniter continuity" },
-	{ 0,	ao_ignite_manual,	NULL },
+	{ ao_ignite_manual,	"i <key> {main|drogue}\0Fire igniter. <key> is doit with D&I" },
+	{ ao_ignite_test,	"t\0Test igniter" },
+	{ 0,	NULL },
 };
 
 __xdata struct ao_task ao_igniter_task;