diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:04:49 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:04:49 -0700 |
| commit | 70e9064ca962dfd345f8a342afa130f969606553 (patch) | |
| tree | e8e374912df403e7e237aecbd1ec0a19fa6c5c42 /src/drivers/ao_pad.c | |
| parent | 489d22f448d9927533e90da4d16c5a332a234a8d (diff) | |
| parent | 73ce3f73526edfabccd3b98e6e67de6d82a84b63 (diff) | |
Merge branch 'master' into branch-1.6
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(); |