summaryrefslogtreecommitdiff
path: root/src/drivers/ao_lco_func.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-01-10 19:09:09 -0700
committerBdale Garbee <bdale@gag.com>2016-01-10 19:09:09 -0700
commit4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch)
tree4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /src/drivers/ao_lco_func.c
parent19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff)
parenta2ea621eac3263348aff50885c79296f8ece26ed (diff)
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'src/drivers/ao_lco_func.c')
-rw-r--r--src/drivers/ao_lco_func.c11
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);
}
-