mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
moved waiting until no codec2 data decoded to socket
This commit is contained in:
parent
39eed33c6b
commit
de4c82c441
2 changed files with 6 additions and 6 deletions
|
@ -1009,12 +1009,6 @@ class RF:
|
||||||
self.log.debug("[MDM] self.modem_transmit_queue", qsize=queuesize)
|
self.log.debug("[MDM] self.modem_transmit_queue", qsize=queuesize)
|
||||||
data = self.modem_transmit_queue.get()
|
data = self.modem_transmit_queue.get()
|
||||||
|
|
||||||
# TODO: carefully test this
|
|
||||||
# avoid sending data while we are receiving codec2 signalling data
|
|
||||||
interrupt_time = time.time() + 5
|
|
||||||
while ModemParam.is_codec2_traffic and time.time() < interrupt_time:
|
|
||||||
threading.Event().wait(0.01)
|
|
||||||
|
|
||||||
# self.log.debug("[MDM] worker_transmit", mode=data[0])
|
# self.log.debug("[MDM] worker_transmit", mode=data[0])
|
||||||
self.transmit(
|
self.transmit(
|
||||||
mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3]
|
mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3]
|
||||||
|
|
|
@ -666,6 +666,12 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
|
||||||
# wait some random time
|
# wait some random time
|
||||||
helpers.wait(randrange(5, 25, 5) / 10.0)
|
helpers.wait(randrange(5, 25, 5) / 10.0)
|
||||||
|
|
||||||
|
# TODO: carefully test this
|
||||||
|
# avoid sending data while we are receiving codec2 signalling data
|
||||||
|
interrupt_time = time.time() + 5
|
||||||
|
while ModemParam.is_codec2_traffic and time.time() < interrupt_time:
|
||||||
|
threading.Event().wait(0.01)
|
||||||
|
|
||||||
# we need to warn if already in arq state
|
# we need to warn if already in arq state
|
||||||
if ARQ.arq_state:
|
if ARQ.arq_state:
|
||||||
command_response("send_raw", False)
|
command_response("send_raw", False)
|
||||||
|
|
Loading…
Reference in a new issue