projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/chaoskey: Add another USB endpoint to read raw data
[fw/altos]
/
src
/
drivers
/
ao_packet.c
diff --git
a/src/drivers/ao_packet.c
b/src/drivers/ao_packet.c
index 5a50747888a01225da2a8bc7cbe0f6dd247f7334..18330eadbec53deb7faf4f8468227f5cdc494bd7 100644
(file)
--- a/
src/drivers/ao_packet.c
+++ b/
src/drivers/ao_packet.c
@@
-31,7
+31,6
@@
__xdata uint8_t ao_packet_restart;
#if PACKET_HAS_MASTER
__xdata uint8_t ao_packet_master_sleeping;
#if PACKET_HAS_MASTER
__xdata uint8_t ao_packet_master_sleeping;
-__xdata uint8_t ao_packet_last_rssi;
#endif
void
#endif
void
@@
-55,14
+54,14
@@
ao_packet_send(void)
}
uint8_t
}
uint8_t
-ao_packet_recv(
void
)
+ao_packet_recv(
uint16_t timeout
)
{
uint8_t dma_done;
#ifdef AO_LED_GREEN
ao_led_on(AO_LED_GREEN);
#endif
{
uint8_t dma_done;
#ifdef AO_LED_GREEN
ao_led_on(AO_LED_GREEN);
#endif
- dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv));
+ dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv)
, timeout
);
#ifdef AO_LED_GREEN
ao_led_off(AO_LED_GREEN);
#endif
#ifdef AO_LED_GREEN
ao_led_off(AO_LED_GREEN);
#endif
@@
-85,9
+84,6
@@
ao_packet_recv(void)
if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
return 0;
if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
return 0;
-#if PACKET_HAS_MASTER
- ao_packet_last_rssi = ao_rx_packet.rssi;
-#endif
/* Accept packets with matching call signs, or any packet if
* our callsign hasn't been configured
*/
/* Accept packets with matching call signs, or any packet if
* our callsign hasn't been configured
*/