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 Projects Releases Packages Wiki Activity

improved qrv slots

Browse source
This commit is contained in:
DJ2LS 2023-04-22 15:28:50 +02:00
parent 0a2ee0ea32
commit 0707c64dcb
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tnc/data_handler.py
View file

@ -38,7 +38,6 @@ class DATA:
log = structlog.get_logger("DATA") log = structlog.get_logger("DATA")
def __init__(self) -> None: def __init__(self) -> None:
self.stats = stats.stats() self.stats = stats.stats()
@ -54,6 +53,11 @@ class DATA:
self.length_sig0_frame = 14 self.length_sig0_frame = 14
self.length_sig1_frame = 14 self.length_sig1_frame = 14
# duration of signalling frame
self.duration_sig0_frame = 1.98
self.duration_sig1_frame = 1.98
self.longest_duration = 5.8 # datac5
# hold session id # hold session id
self.session_id = bytes(1) self.session_id = bytes(1)
@ -149,7 +153,7 @@ class DATA:
# minimum payload for arq burst # minimum payload for arq burst
# import for avoiding byteorder bug and buffer search area # import for avoiding byteorder bug and buffer search area
self.arq_burst_header_size = 3 self.arq_burst_header_size = 3
self.arq_burst_minimum_payload = 126 - self.arq_burst_header_size self.arq_burst_minimum_payload = 56 - self.arq_burst_header_size
self.arq_burst_maximum_payload = 510 - self.arq_burst_header_size self.arq_burst_maximum_payload = 510 - self.arq_burst_header_size
self.is_IRS = False self.is_IRS = False
@ -2074,13 +2078,13 @@ class DATA:
) )
# wait while timeout not reached and our busy state is busy # wait while timeout not reached and our busy state is busy
channel_busy_timeout = time.time() + 10 channel_busy_timeout = time.time() + 5
while static.CHANNEL_BUSY and time.time() < channel_busy_timeout: while static.CHANNEL_BUSY and time.time() < channel_busy_timeout:
threading.Event().wait(0.01) threading.Event().wait(0.01)
self.enqueue_frame_for_tx([connection_frame], c2_mode=FREEDV_MODE.sig0.value, copies=1, repeat_delay=0) self.enqueue_frame_for_tx([connection_frame], c2_mode=FREEDV_MODE.sig0.value, copies=1, repeat_delay=0)
timeout = time.time() + 5 + (static.TX_DELAY/1000 * 2) timeout = time.time() + self.duration_sig1_frame * 3 + (static.TX_DELAY/1000 * 2)
while time.time() < timeout: while time.time() < timeout:
threading.Event().wait(0.01) threading.Event().wait(0.01)
# Stop waiting if data channel is opened # Stop waiting if data channel is opened
@ -2784,9 +2788,11 @@ class DATA:
# TODO: Update this to datac13 # TODO: Update this to datac13
# Sleep a random amount of time before responding to make it more likely to be # Sleep a random amount of time before responding to make it more likely to be
# heard when many stations respond. Each DATAC0 frame is 0.44 sec (440ms) in # heard when many stations respond. Each DATAC0 frame is 0.44 sec (440ms) in
# duration, plus overhead. Set the wait interval to be random between 0 and 2s # duration, plus overhead. Set the wait interval to be random between 0 and
# in 0.5s increments. # self.duration_sig1_frame * 4 == 4 slots
helpers.wait(randrange(0, 20, 5) / 10.0) # in self.duration_sig1_frame increments.
self.log.info("[TNC] Waiting for QRV slot...")
helpers.wait(randrange(0, int(self.duration_sig1_frame*4), self.duration_sig1_frame*10 // 10.0))
self.send_data_to_socket_queue( self.send_data_to_socket_queue(
freedata="tnc-message", freedata="tnc-message",
qrv="transmitting", qrv="transmitting",