X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_ignite.c;h=798ba9b45ae4fc774e1e793b2e03b304a6068cad;hb=1e56ed44e562f808addfd76bfb352f981db94094;hp=981cf0ce1299413a8f520c79b127aa424500a0b6;hpb=4114210e0b813f4af99d0cb7755ad2ac2c4b120e;p=fw%2Faltos

diff --git a/src/ao_ignite.c b/src/ao_ignite.c
index 981cf0ce..798ba9b4 100644
--- a/src/ao_ignite.c
+++ b/src/ao_ignite.c
@@ -26,7 +26,7 @@
 /* test these values with real igniters */
 #define AO_IGNITER_OPEN		1000
 #define AO_IGNITER_CLOSED	7000
-#define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(500)
+#define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
 
 struct ao_ignition {
@@ -52,7 +52,6 @@ ao_igniter_status(enum ao_igniter igniter)
 	__xdata uint8_t request, firing, fired;
 
 	__critical {
-		ao_adc_sleep();
 		ao_adc_get(&adc);
 		request = ao_ignition[igniter].request;
 		fired = ao_ignition[igniter].fired;
@@ -101,7 +100,6 @@ void
 ao_igniter(void)
 {
 	__xdata enum ao_ignter igniter;
-	__xdata enum ao_igniter_status status;
 
 	ao_config_get();
 	for (;;) {
@@ -113,9 +111,7 @@ ao_igniter(void)
 
 				ao_igniter_fire(igniter);
 				ao_delay(AO_IGNITER_CHARGE_TIME);
-				status = ao_igniter_status(igniter);
-				if (status == ao_igniter_open)
-					ao_ignition[igniter].fired = 1;
+				ao_ignition[igniter].fired = 1;
 			}
 		}
 	}
@@ -158,9 +154,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 continuity" },
+	{ 0,	NULL },
 };
 
 __xdata struct ao_task ao_igniter_task;