X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco_func.c;h=08d454670acb0bd881da59385e6e2ac265a3e038;hb=bab082605e3fca6b6d11447c45cd948ddfe74bb9;hp=99e58b76f872bc014e992ae622242cce1bc80701;hpb=5f31f6652f4b0898214d06d009af823a1ed3b96a;p=fw%2Faltos

diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c
index 99e58b76..08d45467 100644
--- a/src/drivers/ao_lco_func.c
+++ b/src/drivers/ao_lco_func.c
@@ -26,18 +26,31 @@ 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	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);
-	command.tick = ao_time() - *tick_offset;
+	command.tick = ao_time();
 	command.box = box;
 	command.cmd = AO_LAUNCH_QUERY;
 	command.channels = 0;
 	ao_radio_cmac_send(&command, sizeof (command));
 	sent_time = ao_time();
-	r = ao_radio_cmac_recv(query, sizeof (*query), AO_MS_TO_TICKS(20));
+	r = ao_radio_cmac_recv(query, sizeof (*query), timeout);
 	if (r == AO_RADIO_CMAC_OK)
 		*tick_offset = sent_time - query->tick;
 	ao_mutex_put(&ao_lco_mutex);
@@ -57,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);
 }
-