X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco_func.c;h=06350694145d4bda978ac894eb2a011160543ada;hb=refs%2Fheads%2Fmaster;hp=1960683fa6b214a56cd7fd87800cd1a7c6e7562d;hpb=ad947ec3f313bbd1295af5dc64f1af9ec09bfe27;p=fw%2Faltos diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c index 1960683f..f5e27e60 100644 --- a/src/drivers/ao_lco_func.c +++ b/src/drivers/ao_lco_func.c @@ -29,7 +29,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset) { int8_t r; AO_TICK_TYPE sent_time; - AO_TICK_TYPE timeout = AO_MS_TO_TICKS(10); + AO_TICK_TYPE timeout = AO_MS_TO_TICKS(20); #if HAS_RADIO_RATE switch (ao_config.radio_rate) { @@ -37,7 +37,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset) default: break; case AO_RADIO_RATE_9600: - timeout = AO_MS_TO_TICKS(20); + timeout = AO_MS_TO_TICKS(30); break; case AO_RADIO_RATE_2400: timeout = AO_MS_TO_TICKS(80); @@ -45,7 +45,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(); + command.tick = (uint16_t) ao_time(); command.box = box; command.cmd = AO_PAD_QUERY; command.channels = 0; @@ -53,7 +53,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset) sent_time = ao_time(); r = ao_radio_cmac_recv(query, sizeof (*query), timeout); if (r == AO_RADIO_CMAC_OK) - *tick_offset = sent_time - query->tick; + *tick_offset = (uint16_t) sent_time - query->tick; ao_mutex_put(&ao_lco_mutex); return r; }