Switch from GPLv2 to GPLv2+

[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 152b5d1ba5b1d06e6c9b509a7b012597f88df036..862cb1be76d628745a8402da16cce6ac2e4655eb 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
- * 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
@@ -26,20 +27,33 @@ static __xdata uint8_t                      ao_lco_mutex;
 int8_t
 ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
 {
-       uint8_t         i;
        int8_t          r;
-       uint16_t        time;
+       uint16_t        sent_time;
+       uint16_t        timeout = AO_MS_TO_TICKS(10);
 
+#if HAS_RADIO_RATE
+       switch (ao_config.radio_rate) {
+       case AO_RADIO_RATE_38400:
+       default:
+               break;
+       case AO_RADIO_RATE_9600:
+               timeout = AO_MS_TO_TICKS(20);
+               break;
+       case AO_RADIO_RATE_2400:
+               timeout = AO_MS_TO_TICKS(80);
+               break;
+       }
+#endif
        ao_mutex_get(&ao_lco_mutex);
-       time = ao_time();
-       command.tick = time;
+       command.tick = ao_time();
        command.box = box;
        command.cmd = AO_LAUNCH_QUERY;
        command.channels = 0;
        ao_radio_cmac_send(&command, sizeof (command));
-       r = ao_radio_cmac_recv(query, sizeof (*query), AO_MS_TO_TICKS(500));
+       sent_time = ao_time();
+       r = ao_radio_cmac_recv(query, sizeof (*query), timeout);
        if (r == AO_RADIO_CMAC_OK)
-               *tick_offset = time - query->tick;
+               *tick_offset = sent_time - query->tick;
        ao_mutex_put(&ao_lco_mutex);
        return r;
 }
@@ -57,14 +71,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);
 }
-