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

send signalling frames once or more

Browse source
This commit is contained in:
DJ2LS 2021-08-14 20:59:12 +02:00 committed by GitHub
parent 5efe491881
commit d3bd9e9230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tnc/data_handler.py
View file

@ -111,8 +111,8 @@ def arq_data_received(data_in):
# TRANSMIT ACK FRAME FOR BURST-----------------------------------------------
modem.transmit_signalling(ack_frame)
#modem.transmit_signalling(ack_frame)
modem.transmit_signalling(ack_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
static.CHANNEL_STATE = 'RECEIVING_DATA'
@ -146,7 +146,7 @@ def arq_data_received(data_in):
rpt_frame[3:9] = missing_frames
# TRANSMIT RPT FRAME FOR BURST-----------------------------------------------
modem.transmit_signalling(rpt_frame)
modem.transmit_signalling(rpt_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
static.CHANNEL_STATE = 'RECEIVING_DATA'
@ -209,8 +209,8 @@ def arq_data_received(data_in):
#time.sleep(0.5) # 0.5
logging.info("ARQ | TX | ARQ DATA FRAME ACK [" + str(static.FRAME_CRC.hex()) + "] [SNR:" + str(static.SNR) + "]")
modem.transmit_signalling(ack_frame)
#modem.transmit_signalling(ack_frame)
modem.transmit_signalling(ack_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -234,7 +234,7 @@ def arq_data_received(data_in):
#time.sleep(0.5) # 0.5
logging.info("ARQ | TX | NAK")
modem.transmit_signalling(nak_frame)
modem.transmit_signalling(nak_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -561,7 +561,7 @@ async def arq_open_data_channel(mode):
while not static.ARQ_READY_FOR_DATA:
for attempt in range(0,static.ARQ_OPEN_DATA_CHANNEL_RETRIES):
logging.info("DATA [" + str(static.MYCALLSIGN, 'utf-8') + "]>> <<[" + str(static.DXCALLSIGN, 'utf-8') + "] A:[" + str(attempt + 1) + "/" + str(static.ARQ_OPEN_DATA_CHANNEL_RETRIES) + "]")
modem.transmit_signalling(connection_frame)
modem.transmit_signalling(connection_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -600,8 +600,8 @@ def arq_received_data_channel_opener(data_in):
connection_frame[12:13] = bytes([static.ARQ_DATA_CHANNEL_MODE])
modem.transmit_signalling(connection_frame)
#modem.transmit_signalling(connection_frame)
modem.transmit_signalling(connection_frame, 2)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -652,7 +652,7 @@ def transmit_ping(callsign):
ping_frame[3:9] = static.MYCALLSIGN
# wait while sending....
modem.transmit_signalling(ping_frame)
modem.transmit_signalling(ping_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -671,8 +671,8 @@ def received_ping(data_in):
ping_frame[3:9] = static.MYGRID
# wait while sending....
modem.transmit_signalling(ping_frame)
#modem.transmit_signalling(ping_frame)
modem.transmit_signalling(ping_frame, 1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
@ -706,16 +706,16 @@ def transmit_cq():
cq_frame[8:14] = static.MYGRID
#print(cq_frame)
for i in range(0, 3):
modem.transmit_signalling(cq_frame)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)
time_between_cq = time.time() + 1
while time.time() < time_between_cq:
pass
modem.transmit_signalling(cq_frame, 3)
#for i in range(0, 3):
#
# modem.transmit_signalling(cq_frame, 1)
# while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
# time.sleep(0.01)
#
# time_between_cq = time.time() + 1
# while time.time() < time_between_cq:
# pass
def received_cq(data_in):
@ -738,7 +738,7 @@ async def transmit_beacon():
while static.TNC_STATE == 'BEACON':
await asyncio.sleep(60)
modem.transmit_signalling(beacon_frame)
modem.transmit_signalling(beacon_frame,1)
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
time.sleep(0.01)

13
tnc/modem.py
View file

@ -198,7 +198,7 @@ class RF():
self.audio_writing_to_stream = False
# --------------------------------------------------------------------------------------------------------
def transmit_signalling(self, data_out):
def transmit_signalling(self, data_out, count):
self.c_lib.freedv_open.restype = ctypes.POINTER(ctypes.c_ubyte)
freedv = self.c_lib.freedv_open(static.FREEDV_SIGNALLING_MODE)
@ -237,9 +237,13 @@ class RF():
converted_audio = audioop.ratecv(self.streambuffer,2,1,static.MODEM_SAMPLE_RATE, static.AUDIO_SAMPLE_RATE_TX, None)
self.streambuffer = bytes(converted_audio[0])
print(len(self.streambuffer))
self.streambuffer += bytes(converted_audio[0])
print(len(self.streambuffer))
# append frame again with as much as in count defined
for i in range(1, count):
self.streambuffer += bytes(converted_audio[0])
print(len(self.streambuffer))
#self.streambuffer += bytes(converted_audio[0])
#print(len(self.streambuffer))
# -------------- transmit audio
#logging.debug("SENDING SIGNALLING FRAME " + str(data_out))
@ -389,6 +393,7 @@ class RF():
converted_audio = audioop.ratecv(self.streambuffer,2,1,static.MODEM_SAMPLE_RATE, static.AUDIO_SAMPLE_RATE_TX, None)
self.streambuffer = bytes(converted_audio[0])
# -------------- transmit audio