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_lco_func.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_lco_func.c')
-rw-r--r-- | src/drivers/ao_lco_func.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c index 32c00068..08d45467 100644 --- a/src/drivers/ao_lco_func.c +++ b/src/drivers/ao_lco_func.c @@ -44,7 +44,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset) } #endif ao_mutex_get(&ao_lco_mutex); - command.tick = ao_time() - *tick_offset; + command.tick = ao_time(); command.box = box; command.cmd = AO_LAUNCH_QUERY; command.channels = 0; @@ -70,14 +70,13 @@ ao_lco_arm(uint16_t box, uint8_t channels, uint16_t tick_offset) } void -ao_lco_ignite(uint16_t box, uint8_t channels, uint16_t tick_offset) +ao_lco_ignite(void) { ao_mutex_get(&ao_lco_mutex); - command.tick = ao_time() - tick_offset; - command.box = box; + command.tick = 0; + command.box = 0; command.cmd = AO_LAUNCH_FIRE; - command.channels = channels; + command.channels = 0; ao_radio_cmac_send(&command, sizeof (command)); ao_mutex_put(&ao_lco_mutex); } - |