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

added ARQ ACK TX function

Browse source
This commit is contained in:
DJ2LS 2021-01-21 08:33:45 +01:00 committed by GitHub
parent e1f64e7512
commit 0dbe03669d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arq.py
View file

@ -71,7 +71,7 @@ def data_received(data_in):
#TRANSMIT ACK FRAME ----------------------------------------------- #TRANSMIT ACK FRAME -----------------------------------------------
logging.info("TX | SENDING ARQ BURST ACK [" + str(data_in[1:3]) +"]") logging.info("TX | SENDING ARQ BURST ACK [" + str(data_in[1:3]) +"]")
modem.transmit(7,ack_buffer) modem.transmit_arq_ack(ack_buffer)
print(ack_buffer) print(ack_buffer)
# ------------------------------------------------------------ # ------------------------------------------------------------

56
modem.py
View file

@ -94,12 +94,7 @@ class RF():
crc = ctypes.c_ushort(self.c_lib.freedv_gen_crc16(bytes(buffer), payload_per_frame)) # generate CRC16 crc = ctypes.c_ushort(self.c_lib.freedv_gen_crc16(bytes(buffer), payload_per_frame)) # generate CRC16
crc = crc.value.to_bytes(2, byteorder='big') # convert crc to 2 byte hex string crc = crc.value.to_bytes(2, byteorder='big') # convert crc to 2 byte hex string
buffer += crc # append crc16 to buffer buffer += crc # append crc16 to buffer
data = (ctypes.c_ubyte * bytes_per_frame).from_buffer_copy(buffer) data = (ctypes.c_ubyte * bytes_per_frame).from_buffer_copy(buffer)
self.c_lib.freedv_rawdatapreambletx(freedv, mod_out_preamble) self.c_lib.freedv_rawdatapreambletx(freedv, mod_out_preamble)
self.c_lib.freedv_rawdatatx(freedv,mod_out,data) # modulate DATA and safe it into mod_out pointer self.c_lib.freedv_rawdatatx(freedv,mod_out,data) # modulate DATA and safe it into mod_out pointer
@ -117,12 +112,52 @@ class RF():
self.stream_tx.write(audio[0]) self.stream_tx.write(audio[0])
#--------------------------------------------------------------------------------------------------------
def transmit_arq_ack(self,ack_buffer):
self.c_lib.freedv_open.restype = ctypes.POINTER(ctypes.c_ubyte)
freedv = self.c_lib.freedv_open(static.FREEDV_SIGNALLING_MODE)
bytes_per_frame = int(self.c_lib.freedv_get_bits_per_modem_frame(freedv)/8)
payload_per_frame = bytes_per_frame -2
n_nom_modem_samples = self.c_lib.freedv_get_n_nom_modem_samples(freedv)
n_tx_modem_samples = self.c_lib.freedv_get_n_tx_modem_samples(freedv)*2 #get n_tx_modem_samples which defines the size of the modulation object
mod_out = ctypes.c_short * n_tx_modem_samples
mod_out = mod_out()
#mod_out_preamble = ctypes.c_short * n_tx_modem_samples #1760 for mode 10,11,12 #4000 for mode 9
#mod_out_preamble = mod_out_preamble()
buffer = bytearray(payload_per_frame) # use this if CRC16 checksum is required ( DATA1-3)
buffer[:len(ack_buffer)] = ack_buffer # set buffersize to length of data which will be send
crc = ctypes.c_ushort(self.c_lib.freedv_gen_crc16(bytes(buffer), payload_per_frame)) # generate CRC16
crc = crc.value.to_bytes(2, byteorder='big') # convert crc to 2 byte hex string
buffer += crc # append crc16 to buffer
print(bytes(buffer))
data = (ctypes.c_ubyte * bytes_per_frame).from_buffer_copy(buffer)
#self.c_lib.freedv_rawdatapreambletx(freedv, mod_out_preamble)
self.c_lib.freedv_rawdatatx(freedv,mod_out,data) # modulate DATA and safe it into mod_out pointer
# -------------- preamble area
# WE NEED TO ADJUST IT FOR SINGLE TRANSMISSION
if static.FREEDV_SIGNALLING_MODE == 7:
modulation = bytes(mod_out)
txbuffer = modulation[:len(modulation)] + modulation # double transmission in one audio burst
else:
txbuffer = bytearray()
#txbuffer += bytes(mod_out_preamble)
txbuffer += bytes(mod_out)
# -------------- audio sample rate conversion
audio = audioop.ratecv(txbuffer,2,1,static.MODEM_SAMPLE_RATE, static.AUDIO_SAMPLE_RATE_TX, static.TX_SAMPLE_STATE)
# -------------- transmit audio
self.stream_tx.write(audio[0])
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
# GET ARQ BURST FRAME VOM BUFFER AND MODULATE IT # GET ARQ BURST FRAME VOM BUFFER AND MODULATE IT
def transmit_arq_burst(self): def transmit_arq_burst(self):
static.ARQ_STATE = 'SENDING_DATA' static.ARQ_STATE = 'SENDING_ACK'
self.c_lib.freedv_open.restype = ctypes.POINTER(ctypes.c_ubyte) self.c_lib.freedv_open.restype = ctypes.POINTER(ctypes.c_ubyte)
freedv = self.c_lib.freedv_open(static.FREEDV_DATA_MODE) freedv = self.c_lib.freedv_open(static.FREEDV_DATA_MODE)
@ -175,7 +210,7 @@ class RF():
self.stream_tx.write(audio[0]) self.stream_tx.write(audio[0])
static.ARQ_STATE = 'IDLE' static.ARQ_STATE = 'IDLE'
#--------------------------------------------------------------------------------------------------------
def receive(self,data_mode,signalling_mode): def receive(self,data_mode,signalling_mode):
print("RECEIVING FOR DATA MODE: " + str(data_mode)) print("RECEIVING FOR DATA MODE: " + str(data_mode))
@ -227,7 +262,6 @@ class RF():
print("MODE: " + str(data_mode) + " DATA: " + str(bytes(data_bytes_out))) print("MODE: " + str(data_mode) + " DATA: " + str(bytes(data_bytes_out)))
while static.ARQ_STATE == 'IDLE' or static.ARQ_STATE == 'RECEIVING_ACK': while static.ARQ_STATE == 'IDLE' or static.ARQ_STATE == 'RECEIVING_ACK':
time.sleep(0.01) time.sleep(0.01)

2
static.py
View file

@ -10,7 +10,7 @@ Created on Wed Dec 23 11:13:57 2020
# FreeDV Defaults # FreeDV Defaults
FREEDV_DATA_MODE = 12 FREEDV_DATA_MODE = 12
FREEDV_SIGNALLING_MODE = 12 FREEDV_SIGNALLING_MODE = 7
FREEDV_DATA_BYTES_PER_FRAME = 0 FREEDV_DATA_BYTES_PER_FRAME = 0
FREEDV_DATA_PAYLOAD_PER_FRAME = 0 FREEDV_DATA_PAYLOAD_PER_FRAME = 0