Skip to content

do not clear FIFO on receive timeout #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhalbert merged 1 commit into from
Dec 17, 2025
Merged

do not clear FIFO on receive timeout #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 67 additions & 59 deletions adafruit_rfm/rfm_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@ async def asyncio_receive( # noqa: PLR0912
# Make sure we are listening for packets.
self.listen()
timed_out = await asyncio_check_timeout(self.payload_ready, timeout, self.timeout_poll)
if timed_out and not self.payload_ready():
# Return if timed out without clearing FIFO
if not keep_listening:
self.idle()
return None
# Payload ready is set, a packet is in the FIFO.
packet = None
# save last RSSI reading
Expand All @@ -425,24 +430,23 @@ async def asyncio_receive( # noqa: PLR0912

# Enter idle mode to stop receiving other packets.
self.idle()
if not timed_out:
if self.enable_crc and self.crc_error:
self.crc_error_count += 1
else:
packet = self.read_fifo()
if (packet is not None) and self.radiohead:
if len(packet) < 5:
# reject the packet if it is too small to contain the RAdioHead Header
if self.enable_crc and self.crc_error:
self.crc_error_count += 1
else:
packet = self.read_fifo()
if (packet is not None) and self.radiohead:
if len(packet) < 5:
# reject the packet if it is too small to contain the RAdioHead Header
packet = None
if packet is not None:
if (
self.node != _RH_BROADCAST_ADDRESS # noqa: PLR1714
and packet[0] != _RH_BROADCAST_ADDRESS
and packet[0] != self.node
):
packet = None
if packet is not None:
if (
self.node != _RH_BROADCAST_ADDRESS # noqa: PLR1714
and packet[0] != _RH_BROADCAST_ADDRESS
and packet[0] != self.node
):
packet = None
if not with_header and packet is not None: # skip the header if not wanted
packet = packet[4:]
if not with_header and packet is not None: # skip the header if not wanted
packet = packet[4:]
# Listen again if necessary and return the result packet.
if keep_listening:
self.listen()
Expand Down Expand Up @@ -490,6 +494,11 @@ async def asyncio_receive_with_ack( # noqa: PLR0912
# Make sure we are listening for packets.
self.listen()
timed_out = await asyncio_check_timeout(self.payload_ready, timeout, self.timeout_poll)
if timed_out and not self.payload_ready():
# Return if timed out without clearing FIFO
if not keep_listening:
self.idle()
return None
# Payload ready is set, a packet is in the FIFO.
packet = None
# save last RSSI reading
Expand All @@ -498,51 +507,50 @@ async def asyncio_receive_with_ack( # noqa: PLR0912

# Enter idle mode to stop receiving other packets.
self.idle()
if not timed_out:
if self.enable_crc and self.crc_error:
self.crc_error_count += 1
else:
packet = self.read_fifo()
if (packet is not None) and self.radiohead:
if len(packet) < 5:
# reject the packet if it is too small to contain the RAdioHead Header
if self.enable_crc and self.crc_error:
self.crc_error_count += 1
else:
packet = self.read_fifo()
if (packet is not None) and self.radiohead:
if len(packet) < 5:
# reject the packet if it is too small to contain the RAdioHead Header
packet = None
if packet is not None:
if (
self.node != _RH_BROADCAST_ADDRESS # noqa: PLR1714
and packet[0] != _RH_BROADCAST_ADDRESS
and packet[0] != self.node
):
packet = None
if packet is not None:
if (
self.node != _RH_BROADCAST_ADDRESS # noqa: PLR1714
and packet[0] != _RH_BROADCAST_ADDRESS
and packet[0] != self.node
):
packet = None
# send ACK unless this was an ACK or a broadcast
elif ((packet[3] & _RH_FLAGS_ACK) == 0) and (
packet[0] != _RH_BROADCAST_ADDRESS
# send ACK unless this was an ACK or a broadcast
elif ((packet[3] & _RH_FLAGS_ACK) == 0) and (
packet[0] != _RH_BROADCAST_ADDRESS
):
# delay before sending Ack to give receiver a chance to get ready
if self.ack_delay is not None:
await asyncio.sleep(self.ack_delay)
# send ACK packet to sender (data is b'!')
await self.asyncio_send(
b"!",
destination=packet[1],
node=packet[0],
identifier=packet[2],
flags=(packet[3] | _RH_FLAGS_ACK),
keep_listening=keep_listening,
)
# reject Retries if we have seen this idetifier from this source before
if (self.seen_ids[packet[1]] == packet[2]) and (
packet[3] & _RH_FLAGS_RETRY
):
# delay before sending Ack to give receiver a chance to get ready
if self.ack_delay is not None:
await asyncio.sleep(self.ack_delay)
# send ACK packet to sender (data is b'!')
await self.asyncio_send(
b"!",
destination=packet[1],
node=packet[0],
identifier=packet[2],
flags=(packet[3] | _RH_FLAGS_ACK),
keep_listening=keep_listening,
)
# reject Retries if we have seen this idetifier from this source before
if (self.seen_ids[packet[1]] == packet[2]) and (
packet[3] & _RH_FLAGS_RETRY
):
packet = None
else: # save the packet identifier for this source
self.seen_ids[packet[1]] = packet[2]
if (
packet is not None and (packet[3] & _RH_FLAGS_ACK) != 0
): # Ignore it if it was an ACK packet
packet = None
if not with_header and packet is not None: # skip the header if not wanted
packet = packet[4:]
else: # save the packet identifier for this source
self.seen_ids[packet[1]] = packet[2]
if (
packet is not None and (packet[3] & _RH_FLAGS_ACK) != 0
): # Ignore it if it was an ACK packet
packet = None
if not with_header and packet is not None: # skip the header if not wanted
packet = packet[4:]
# Listen again if necessary and return the result packet.
if keep_listening:
self.listen()
Expand Down