diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
| commit | 51c7741040d95c5deece939dae5e4136cc04afc4 (patch) | |
| tree | 96631ee5aa9fd0c8c45f019ff154cc4fc8ca85d0 /src/ao_ignite.c | |
| parent | d1dbe3b69e6f95ef8ecd4cf959863b922ab47c66 (diff) | |
| parent | 4e47c44d335276cf0dc5ed3a0756e50c98c1b9b9 (diff) | |
Merge branch 'buttonbox'
Conflicts:
doc/telemetrum-doc.xsl
Pull the buttbox version of the docs in as it had been updated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/ao_ignite.c')
| -rw-r--r-- | src/ao_ignite.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ao_ignite.c b/src/ao_ignite.c index 4093b6a7..f2b15dd2 100644 --- a/src/ao_ignite.c +++ b/src/ao_ignite.c @@ -101,7 +101,6 @@ void ao_igniter(void) { __xdata enum ao_ignter igniter; - __xdata enum ao_igniter_status status; ao_config_get(); for (;;) { @@ -113,9 +112,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; } } } |