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_lco_func.c | |
| parent | 489d22f448d9927533e90da4d16c5a332a234a8d (diff) | |
| parent | 73ce3f73526edfabccd3b98e6e67de6d82a84b63 (diff) | |
Merge branch 'master' into branch-1.6
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); } - |