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

preparing for rx buffer

Browse source
This commit is contained in:
DJ2LS 2021-08-16 19:41:20 +02:00 committed by GitHub
parent 6686eceac7
commit 43c3f0c626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tnc/data_handler.py
View file

@ -197,7 +197,11 @@ def arq_data_received(data_in):
# append received frame to RX_BUFFER
static.RX_BUFFER.append({"DXCALL" : static.DXCALLSIGN ,"DATA" : complete_data_frame.decode("utf-8")})
###static.RX_BUFFER.append({"DXCALL" : static.DXCALLSIGN ,"DATA" : complete_data_frame.decode("utf-8")})
###static.RX_BUFFER.append([static.DXCALLSIGN,static.DXGRID,int(time.time()), complete_data_frame.decode("utf-8")])
static.RX_BUFFER.append([static.DXCALLSIGN,static.DXGRID,int(time.time()), complete_data_frame.decode("utf-8")])
# BUILDING ACK FRAME FOR DATA FRAME -----------------------------------------------
ack_frame = bytearray(14)

7
tnc/sock.py
View file

@ -122,11 +122,10 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
static.DXCALLSIGN = bytes(dxcallsign, 'utf-8')
static.DXCALLSIGN_CRC8 = helpers.get_crc_8(static.DXCALLSIGN)
##dataframe = '{"filename": "'+ filename + '", "filetype" : "' + filetype + '", "data" : "' + data + '", "checksum" : "' + checksum + '"}'
#dataframe = '{"filename": "'+ filename + '", "filetype" : "' + filetype + '", "data" : "' + data + '", "checksum" : "' + checksum + '"}'
dataframe = {"filename" : filename , "filetype" :filetype, "data" : data, "checksum" :checksum}
#dataframe = {filename: filename}
#data_out = bytes(received_json["data"], 'utf-8')
dataframe = json.dumps(dataframe)
data_out = bytes(dataframe, 'utf-8')
@ -225,7 +224,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
#print(static.RX_BUFFER[i])
output["DATA"].append({"DXCALLSIGN": str(static.RX_BUFFER[i][0], 'utf-8'),"DXGRID": str(static.RX_BUFFER[i][1], 'utf-8'), "TIMESTAMP": static.RX_BUFFER[i][2], "DATA": static.RX_BUFFER[i][3]})
output["DATA"].append({"DXCALLSIGN": str(static.RX_BUFFER[i][0], 'utf-8'),"DXGRID": str(static.RX_BUFFER[i][1], 'utf-8'), "TIMESTAMP": static.RX_BUFFER[i][2], "DATA": [static.RX_BUFFER[i][3]]})
print(output)
jsondata = json.dumps(output)