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

arq rpt bug fix for small transmission

Browse source
This commit is contained in:
DJ2LS 2021-03-19 12:06:12 +01:00 committed by GitHub
parent a1d2d752d4
commit b815f655ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
data_handler.py
View file

@ -140,7 +140,7 @@ def arq_data_received(data_in):
# BUILDING RPT FRAME FOR BURST ----------------------------------------------- # BUILDING RPT FRAME FOR BURST -----------------------------------------------
rpt_frame = bytearray(14) rpt_frame = bytearray(14)
rpt_frame[:1] = bytes([63]) rpt_frame[:1] = bytes([62])
rpt_frame[1:2] = static.DXCALLSIGN_CRC8 rpt_frame[1:2] = static.DXCALLSIGN_CRC8
rpt_frame[2:3] = static.MYCALLSIGN_CRC8 rpt_frame[2:3] = static.MYCALLSIGN_CRC8
rpt_frame[3:9] = missing_frames rpt_frame[3:9] = missing_frames
@ -339,11 +339,11 @@ def arq_transmit(data_out):
while not static.ARQ_ACK_RECEIVED and not static.ARQ_FRAME_ACK_RECEIVED and time.time() < rpttimeout: #static.ARQ_RX_RPT_TIMEOUT == False: while not static.ARQ_ACK_RECEIVED and not static.ARQ_FRAME_ACK_RECEIVED and time.time() < rpttimeout: #static.ARQ_RX_RPT_TIMEOUT == False:
time.sleep(0.01) # lets reduce CPU load a little bit time.sleep(0.01) # lets reduce CPU load a little bit
logging.info(static.ARQ_STATE) #logging.info(static.ARQ_STATE)
if static.ARQ_ACK_RECEIVED: if static.ARQ_ACK_RECEIVED:
logging.info("ARQ | RX | ACK AFTER RPT") logging.info("ARQ | RX | ACK AFTER RPT")
rpttimer.cancel() #rpttimer.cancel()
helpers.arq_reset_ack(True) helpers.arq_reset_ack(True)
static.ARQ_RPT_FRAMES = [] static.ARQ_RPT_FRAMES = []
@ -353,11 +353,25 @@ def arq_transmit(data_out):
helpers.arq_reset_ack(False) helpers.arq_reset_ack(False)
static.ARQ_RPT_FRAMES = [] static.ARQ_RPT_FRAMES = []
# --------------- BREAK LOOP IF FRAME ACK HAS BEEN RECEIVED EARLIER AS EXPECTED
elif static.ARQ_FRAME_ACK_RECEIVED:
logging.info("ARQ | RX | EARLY FRAME ACK RECEIVED #2")
static.ARQ_N_SENT_FRAMES = static.ARQ_N_SENT_FRAMES + static.ARQ_TX_N_FRAMES_PER_BURST
break
# -------------------------------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------------------------------
elif not static.ARQ_ACK_RECEIVED: # and static.ARQ_RX_ACK_TIMEOUT == True: elif not static.ARQ_ACK_RECEIVED: # and static.ARQ_RX_ACK_TIMEOUT == True:
logging.warning("ARQ | RX | ACK TIMEOUT!") logging.warning("ARQ | RX | ACK TIMEOUT!")
pass # no break here so we can continue with the next try of repeating the burst pass # no break here so we can continue with the next try of repeating the burst
# --------------- BREAK LOOP IF ACK HAS BEEN RECEIVED # --------------- BREAK LOOP IF ACK HAS BEEN RECEIVED
elif static.ARQ_ACK_RECEIVED: elif static.ARQ_ACK_RECEIVED:
transfer_rates = helpers.calculate_transfer_rate() transfer_rates = helpers.calculate_transfer_rate()
@ -366,19 +380,21 @@ def arq_transmit(data_out):
static.ARQ_N_SENT_FRAMES = static.ARQ_N_SENT_FRAMES + static.ARQ_TX_N_FRAMES_PER_BURST static.ARQ_N_SENT_FRAMES = static.ARQ_N_SENT_FRAMES + static.ARQ_TX_N_FRAMES_PER_BURST
break break
# --------------- BREAK LOOP IF FRAME ACK HAS BEEN RECEIVED EARLIER AS EXPECTED
elif static.ARQ_FRAME_ACK_RECEIVED:
logging.info("ARQ | RX | EARLY FRAME ACK RECEIVED")
static.ARQ_N_SENT_FRAMES = static.ARQ_N_SENT_FRAMES + static.ARQ_TX_N_FRAMES_PER_BURST
break
else: else:
logging.info("------------------------------->NO RULE MATCHED!") logging.info("------------------------------->NO RULE MATCHED!")
print("ARQ_ACK_RECEIVED " + str(static.ARQ_ACK_RECEIVED)) print("ARQ_ACK_RECEIVED " + str(static.ARQ_ACK_RECEIVED))
print("ARQ_RX_ACK_TIMEOUT " + str(static.ARQ_RX_ACK_TIMEOUT)) print("ARQ_RX_ACK_TIMEOUT " + str(static.ARQ_RX_ACK_TIMEOUT))
break break
print("static.ARQ_ACK_RECEIVED" + str(static.ARQ_ACK_RECEIVED))
print("static.ARQ_FRAME_ACK_RECEIVED" + str(static.ARQ_FRAME_ACK_RECEIVED))
print("static.ARQ_N_SENT_FRAMES" + str(static.ARQ_N_SENT_FRAMES))
print("static.ARQ_TX_N_TOTAL_ARQ_FRAMES" + str(static.ARQ_TX_N_TOTAL_ARQ_FRAMES))
# --------------------------------WAITING AREA FOR FRAME ACKs # --------------------------------WAITING AREA FOR FRAME ACKs
logging.debug("static.ARQ_N_SENT_FRAMES " + str(static.ARQ_N_SENT_FRAMES)) logging.debug("static.ARQ_N_SENT_FRAMES " + str(static.ARQ_N_SENT_FRAMES))
@ -462,7 +478,7 @@ def burst_rpt_received(data_in):
static.ARQ_DATA_CHANNEL_LAST_RECEIVED = int(time.time()) # we need to update our timeout timestamp static.ARQ_DATA_CHANNEL_LAST_RECEIVED = int(time.time()) # we need to update our timeout timestamp
static.ARQ_RPT_FRAMES = [] static.ARQ_RPT_FRAMES = []
missing_area = bytes(data_in[1:9]) missing_area = bytes(data_in[3:12]) # 1:9
for i in range(0, 6, 2): for i in range(0, 6, 2):
if not missing_area[i:i + 2].endswith(b'\x00\x00'): if not missing_area[i:i + 2].endswith(b'\x00\x00'):