Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / ao_ignite.c

diff --git a/src/ao_ignite.c b/src/ao_ignite.c
index 981cf0ce1299413a8f520c79b127aa424500a0b6..603fcd25f3e37105487ad1005894cfdbabcc9815 100644 (file)
--- 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;
                        }
                }
        }