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

Merge pull request #208 from kronenpj/bugfix_issue_207

Browse source
This commit is contained in:
DJ2LS 2022-06-17 09:19:25 +02:00 committed by GitHub
parent debe742081 b8ac18bc54
commit 7ea176a35b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tnc/data_handler.py
View file

@ -872,11 +872,7 @@ class DATA:
bufferposition = bufferposition_end = 0 bufferposition = bufferposition_end = 0
# Iterate through data_out buffer # Iterate through data_out buffer
while ( while not self.data_frame_ack_received and static.ARQ_STATE:
bufferposition < len(data_out)
and not self.data_frame_ack_received
and static.ARQ_STATE
):
# we have TX_N_MAX_RETRIES_PER_BURST attempts for sending a burst # we have TX_N_MAX_RETRIES_PER_BURST attempts for sending a burst
for self.tx_n_retry_of_burst in range(TX_N_MAX_RETRIES_PER_BURST): for self.tx_n_retry_of_burst in range(TX_N_MAX_RETRIES_PER_BURST):
# AUTO MODE SELECTION # AUTO MODE SELECTION
@ -936,10 +932,6 @@ class DATA:
frame = data_out[bufferposition:bufferposition_end] frame = data_out[bufferposition:bufferposition_end]
frame = arqheader + frame frame = arqheader + frame
# This point shouldn't reached that often
elif bufferposition > len(data_out):
break
# Pad the last bytes of a frame # Pad the last bytes of a frame
else: else:
extended_data_out = data_out[bufferposition:] extended_data_out = data_out[bufferposition:]
@ -982,6 +974,9 @@ class DATA:
if self.burst_ack: if self.burst_ack:
self.burst_ack = False # reset ack state self.burst_ack = False # reset ack state
self.tx_n_retry_of_burst = 0 # reset retries self.tx_n_retry_of_burst = 0 # reset retries
self.log.debug(
"[TNC] arq_transmit: Received BURST ACK. Sending next chunk."
)
break # break retry loop break # break retry loop
if self.burst_nack: if self.burst_nack:
@ -992,12 +987,18 @@ class DATA:
pass pass
if self.data_frame_ack_received: if self.data_frame_ack_received:
self.log.debug(
"[TNC] arq_transmit: Received FRAME ACK. Sending next chunk."
)
break # break retry loop break # break retry loop
# We need this part for leaving the repeat loop # We need this part for leaving the repeat loop
# static.ARQ_STATE == "DATA" --> when stopping transmission manually # static.ARQ_STATE == "DATA" --> when stopping transmission manually
if not static.ARQ_STATE: if not static.ARQ_STATE:
# print("not ready for data...leaving loop....") # print("not ready for data...leaving loop....")
self.log.debug(
"[TNC] arq_transmit: ARQ State changed to FALSE. Breaking retry loop."
)
break break
self.calculate_transfer_rate_tx( self.calculate_transfer_rate_tx(
@ -1029,7 +1030,12 @@ class DATA:
bytesperminute=static.ARQ_BYTES_PER_MINUTE, bytesperminute=static.ARQ_BYTES_PER_MINUTE,
) )
# Stay in the while loop until we receive a data_frame_ack. Otherwise
# the loop exits after sending the last frame only once and doesn't
# wait for an acknowledgement.
if self.data_frame_ack_received and bufferposition > len(data_out):
self.log.debug("[TNC] arq_tx: Last fragment sent and acknowledged.")
break
# GOING TO NEXT ITERATION # GOING TO NEXT ITERATION
if self.data_frame_ack_received: if self.data_frame_ack_received:
@ -1073,12 +1079,13 @@ class DATA:
self.arq_cleanup() self.arq_cleanup()
if TESTMODE: if TESTMODE:
# Quit after transmission # Quit after transmission
self.log.debug("[TNC] TESTMODE: arq_transmit exiting.")
sys.exit(0) sys.exit(0)
# signalling frames received # signalling frames received
def burst_ack_received(self, data_in: bytes): def burst_ack_received(self, data_in: bytes):
""" """
Received a NACK for a transmitted frame, keep track and Received a ACK for a transmitted frame, keep track and
make adjustments to speed level if needed. make adjustments to speed level if needed.
Args: Args:
@ -1100,7 +1107,7 @@ class DATA:
static.FREQ_OFFSET, static.FREQ_OFFSET,
static.HAMLIB_FREQUENCY, static.HAMLIB_FREQUENCY,
) )
# Force data loops of TNC to stop and continue with next frame # Force data retry loops of TX TNC to stop and continue with next frame
self.burst_ack = True self.burst_ack = True
# Update data_channel timestamp # Update data_channel timestamp
self.data_channel_last_received = int(time.time()) self.data_channel_last_received = int(time.time())
@ -2321,6 +2328,7 @@ class DATA:
Cleanup function which clears all ARQ states Cleanup function which clears all ARQ states
""" """
if TESTMODE: if TESTMODE:
self.log.debug("[TNC] TESTMODE: arq_cleanup: Not performing cleanup.")
return return
self.log.debug("[TNC] arq_cleanup") self.log.debug("[TNC] arq_cleanup")