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

improvement of audio to stream

Browse source
This commit is contained in:
DJ2LS 2021-03-09 21:35:52 +01:00 committed by GitHub
parent 2c120065f5
commit 465926cf4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
modem.py
View file

@ -56,7 +56,8 @@ class RF():
) )
self.streambuffer = bytes(2) self.streambuffer = bytes(0)
self.audio_writing_to_stream = False
#--------------------------------------------START DECODER THREAD #--------------------------------------------START DECODER THREAD
FREEDV_DECODER_THREAD_10 = threading.Thread(target=self.receive, args=[10], name="FREEDV_DECODER_THREAD_10") FREEDV_DECODER_THREAD_10 = threading.Thread(target=self.receive, args=[10], name="FREEDV_DECODER_THREAD_10")
FREEDV_DECODER_THREAD_10.start() FREEDV_DECODER_THREAD_10.start()
@ -102,26 +103,21 @@ class RF():
self.my_rig.set_ptt(self.hamlib_ptt_type,0) self.my_rig.set_ptt(self.hamlib_ptt_type,0)
#--------------------------------------------------------------------------------------------------------
def play_audio(self): def play_audio(self):
while True: while True:
time.sleep(0.11) time.sleep(0.01)
state_before_transmit = static.CHANNEL_STATE #state_before_transmit = static.CHANNEL_STATE
#print(len(self.streambuffer))
#print(bytes(self.streambuffer))
#print(static.CHANNEL_STATE)
#print(len(self.streambuffer))
while len(self.streambuffer) > 0: while len(self.streambuffer) > 0:
static.CHANNEL_STATE = 'SENDING_SIGNALLING' time.sleep(0.01)
if len(self.streambuffer) > 0: if len(self.streambuffer) > 0:
print("test") self.audio_writing_to_stream = True
print(len(self.streambuffer))
self.stream_tx.write(self.streambuffer) self.stream_tx.write(self.streambuffer)
time.sleep(0.1) self.streambuffer = bytes()
self.streambuffer = bytes(0) #static.CHANNEL_STATE = state_before_transmit
static.CHANNEL_STATE = state_before_transmit self.audio_writing_to_stream = False
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
def transmit_signalling(self,data_out): def transmit_signalling(self,data_out):
@ -160,12 +156,16 @@ class RF():
# -------------- transmit audio # -------------- transmit audio
logging.debug("SENDING SIGNALLING FRAME " + str(data_out)) logging.debug("SENDING SIGNALLING FRAME " + str(data_out))
#asyncio.run(self.stream_tx.write(bytes(txbuffer)))
#self.stream_tx.write(bytes(txbuffer))
self.streambuffer = bytes() self.streambuffer = bytes()
self.streambuffer = bytes(txbuffer) self.streambuffer = bytes(txbuffer)
#print(self.streambuffer) self.audio_writing_to_stream = True
#print(len(self.streambuffer))
#wait until audio has been processed
while self.audio_writing_to_stream == True:
time.sleep(0.01)
static.CHANNEL_STATE = 'SENDING_SIGNALLING'
self.my_rig.set_ptt(self.hamlib_ptt_type,0) self.my_rig.set_ptt(self.hamlib_ptt_type,0)
static.PTT_STATE = False static.PTT_STATE = False
static.CHANNEL_STATE = state_before_transmit static.CHANNEL_STATE = state_before_transmit