diff options
author | Bdale Garbee <bdale@gag.com> | 2015-09-29 00:46:42 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2015-09-29 00:46:42 -0600 |
commit | 7064bc685aebeef07711e525dea4d5fbe33d235b (patch) | |
tree | 90b7c046fef47ecd2c68c1acafa042871435e24e /src/drivers/ao_pad.c | |
parent | ea1d24151cf76ae8f2368673317b66958e2508c4 (diff) | |
parent | dda3f459eaff8d4e41cb44584c8ef77b8e2b3b1c (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/drivers/ao_pad.c')
-rw-r--r-- | src/drivers/ao_pad.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c index ffe46c68..419ea8d3 100644 --- a/src/drivers/ao_pad.c +++ b/src/drivers/ao_pad.c @@ -288,8 +288,7 @@ ao_pad(void) PRINTD ("armed\n"); ao_pad_armed = command.channels; ao_pad_arm_time = ao_time(); - - /* fall through ... */ + break; case AO_LAUNCH_QUERY: if (command.box != ao_pad_box) { @@ -320,13 +319,6 @@ ao_pad(void) ao_pad_arm_time, ao_time()); break; } - time_difference = command.tick - ao_time(); - if (time_difference < 0) - time_difference = -time_difference; - if (time_difference > 10) { - PRINTD ("time different too large %d\n", time_difference); - break; - } PRINTD ("ignite\n"); ao_pad_ignite = ao_pad_armed; ao_pad_arm_time = ao_time(); |