Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate IRS session hangs

Browse source
This commit is contained in:
Pedro 2023-12-19 17:19:12 +01:00
parent a3b48d2bd9
commit 0a59c4f616
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modem/arq_session_irs.py
View file

@ -69,13 +69,6 @@ class ARQSessionIRS(arq_session.ARQSession):
self.transmit_frame(frame, mode)
self.log(f"Waiting {timeout} seconds...")
if not self.event_frame_received.wait(timeout):
# use case: data burst got lost, we want to send a NACK with updated speed level
if self.state in [IRS_State.BURST_REPLY_SENT, IRS_State.INFO_ACK_SENT]:
self.transmitted_acks = 0
self.calibrate_speed_settings()
self.send_burst_nack()
return
self.log("Timeout waiting for ISS. Session failed.")
self.set_state(IRS_State.FAILED)
self.event_manager.send_arq_finished(False, self.id, self.dxcall, self.total_length, False)
@ -106,6 +99,7 @@ class ARQSessionIRS(arq_session.ARQSession):
self.calibrate_speed_settings()
self.set_decode_mode()
info_ack = self.frame_factory.build_arq_session_info_ack(
self.id, self.total_crc, self.snr[0],
self.speed_level, self.frames_per_burst)
@ -116,7 +110,8 @@ class ARQSessionIRS(arq_session.ARQSession):
self.calibrate_speed_settings()
self.set_decode_mode()
nack = self.frame_factory.build_arq_burst_ack(self.id, self.received_bytes, self.speed_level, self.frames_per_burst, self.snr[0])
self.transmit_frame(nack, mode=FREEDV_MODE.signalling)
self.launch_transmit_and_wait(nack, self.TIMEOUT_DATA, mode=FREEDV_MODE.signalling)
self.log("NACK sent")
def process_incoming_data(self, frame):
if frame['offset'] != self.received_bytes:
@ -151,13 +146,14 @@ class ARQSessionIRS(arq_session.ARQSession):
if not self.all_data_received():
# increase ack counter
self.transmitted_acks += 1
self.transmit_frame(ack, mode=FREEDV_MODE.signalling)
self.set_state(IRS_State.BURST_REPLY_SENT)
self.launch_transmit_and_wait(ack, self.TIMEOUT_DATA, mode=FREEDV_MODE.signalling)
return
if self.final_crc_matches():
self.log("All data received successfully!")
self.transmit_frame(ack, mode=FREEDV_MODE.signalling)
self.log("ACK sent")
self.set_state(IRS_State.ENDED)
self.event_manager.send_arq_session_finished(
False, self.id, self.dxcall, self.total_length, True)

4
tests/test_arq_session.py
View file

@ -53,7 +53,7 @@ class TestARQSession(unittest.TestCase):
cls.irs_modem)
# Frame loss probability in %
cls.loss_probability = 50
cls.loss_probability = 30
@ -93,7 +93,7 @@ class TestARQSession(unittest.TestCase):
def testARQSessionLargePayload(self):
# set Packet Error Rate (PER) / frame loss probability
self.loss_probability = 30
self.loss_probability = 50
self.establishChannels()
params = {