diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-06 23:42:47 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-06 23:42:47 -0600 |
| commit | f0d2d34f84980ab45ecedae17546f4d71e020c5e (patch) | |
| tree | 54a0a736d68b0f64c2aac16e9dbbb581d5ee012a /src/drivers/ao_packet_master.c | |
| parent | 8c212cd5bfa03f71a31d84bd0051314e77d88461 (diff) | |
| parent | 6c812f10761ec4ebf13e29ccef1d6c2c864f1158 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/drivers/ao_packet_master.c')
| -rw-r--r-- | src/drivers/ao_packet_master.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c index d6c99cbd..23545049 100644 --- a/src/drivers/ao_packet_master.c +++ b/src/drivers/ao_packet_master.c @@ -57,6 +57,12 @@ static __xdata uint16_t ao_packet_master_time; #define AO_PACKET_MASTER_DELAY_LONG AO_MS_TO_TICKS(1000) #define AO_PACKET_MASTER_DELAY_TIMEOUT AO_MS_TO_TICKS(2000) +#if HAS_RADIO_RATE +#define AO_PACKET_MASTER_RECV_DELAY AO_MS_TO_TICKS(100) << (ao_config.radio_rate << 1) +#else +#define AO_PACKET_MASTER_RECV_DELAY AO_MS_TO_TICKS(100) +#endif + static void ao_packet_master_busy(void) { @@ -91,7 +97,7 @@ ao_packet_master(void) if (ao_tx_packet.len) ao_packet_master_busy(); ao_packet_master_check_busy(); - ao_alarm(ao_packet_master_delay); + ao_alarm(AO_PACKET_MASTER_RECV_DELAY); r = ao_packet_recv(); ao_clear_alarm(); if (r) { |