projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/scheme: Fix name of constant scheme file
[fw/altos]
/
src
/
drivers
/
ao_lco_func.c
diff --git
a/src/drivers/ao_lco_func.c
b/src/drivers/ao_lco_func.c
index 08d454670acb0bd881da59385e6e2ac265a3e038..92b344ed66c8d3a8b367c51f285f6bf75968823f 100644
(file)
--- a/
src/drivers/ao_lco_func.c
+++ b/
src/drivers/ao_lco_func.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-46,7
+47,7
@@
ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
ao_mutex_get(&ao_lco_mutex);
command.tick = ao_time();
command.box = box;
ao_mutex_get(&ao_lco_mutex);
command.tick = ao_time();
command.box = box;
- command.cmd = AO_
LAUNCH
_QUERY;
+ command.cmd = AO_
PAD
_QUERY;
command.channels = 0;
ao_radio_cmac_send(&command, sizeof (command));
sent_time = ao_time();
command.channels = 0;
ao_radio_cmac_send(&command, sizeof (command));
sent_time = ao_time();
@@
-63,19
+64,19
@@
ao_lco_arm(uint16_t box, uint8_t channels, uint16_t tick_offset)
ao_mutex_get(&ao_lco_mutex);
command.tick = ao_time() - tick_offset;
command.box = box;
ao_mutex_get(&ao_lco_mutex);
command.tick = ao_time() - tick_offset;
command.box = box;
- command.cmd = AO_
LAUNCH
_ARM;
+ command.cmd = AO_
PAD
_ARM;
command.channels = channels;
ao_radio_cmac_send(&command, sizeof (command));
ao_mutex_put(&ao_lco_mutex);
}
void
command.channels = channels;
ao_radio_cmac_send(&command, sizeof (command));
ao_mutex_put(&ao_lco_mutex);
}
void
-ao_lco_ignite(
voi
d)
+ao_lco_ignite(
uint8_t cm
d)
{
ao_mutex_get(&ao_lco_mutex);
command.tick = 0;
command.box = 0;
{
ao_mutex_get(&ao_lco_mutex);
command.tick = 0;
command.box = 0;
- command.cmd =
AO_LAUNCH_FIRE
;
+ command.cmd =
cmd
;
command.channels = 0;
ao_radio_cmac_send(&command, sizeof (command));
ao_mutex_put(&ao_lco_mutex);
command.channels = 0;
ao_radio_cmac_send(&command, sizeof (command));
ao_mutex_put(&ao_lco_mutex);