mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
updated callsin and buffer readings
This commit is contained in:
parent
533d797be3
commit
a36b85aca3
3 changed files with 29 additions and 24 deletions
16
main.py
16
main.py
|
@ -12,8 +12,6 @@ import argparse
|
||||||
import logging
|
import logging
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
import socket
|
|
||||||
|
|
||||||
|
|
||||||
import static
|
import static
|
||||||
import helpers
|
import helpers
|
||||||
|
@ -35,19 +33,12 @@ if __name__ == '__main__':
|
||||||
helpers.list_audio_devices()
|
helpers.list_audio_devices()
|
||||||
|
|
||||||
|
|
||||||
|
#static.MYCALLSIGN = b'DJ2LS'
|
||||||
static.MYCALLSIGN = b'DJ2LS'
|
#static.MYCALLSIGN_CRC8 = helpers.get_crc_8(static.MYCALLSIGN)
|
||||||
static.MYCALLSIGN_CRC8 = helpers.get_crc_8(static.MYCALLSIGN)
|
|
||||||
|
|
||||||
static.DXCALLSIGN = b'DH3WO'
|
static.DXCALLSIGN = b'DH3WO'
|
||||||
static.DXCALLSIGN_CRC8 = helpers.get_crc_8(static.DXCALLSIGN)
|
static.DXCALLSIGN_CRC8 = helpers.get_crc_8(static.DXCALLSIGN)
|
||||||
|
|
||||||
print("MYCALLSIGN " + str(static.MYCALLSIGN))
|
|
||||||
print("MYCALLSIGN_CRC8 " + str(static.MYCALLSIGN_CRC8))
|
|
||||||
|
|
||||||
print("DXCALLSIGN " + str(static.DXCALLSIGN))
|
|
||||||
print("DXCALLSIGN_CRC8 " + str(static.DXCALLSIGN_CRC8))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------GET PARAMETER INPUTS
|
#--------------------------------------------GET PARAMETER INPUTS
|
||||||
|
@ -77,3 +68,6 @@ if __name__ == '__main__':
|
||||||
server_thread.start()
|
server_thread.start()
|
||||||
logging.info("SRV | STARTING TCP/IP SOCKET FOR CMD ON PORT: " + str(static.PORT))
|
logging.info("SRV | STARTING TCP/IP SOCKET FOR CMD ON PORT: " + str(static.PORT))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
25
sock.py
25
sock.py
|
@ -29,15 +29,17 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
#print(threading.enumerate())
|
#print(threading.enumerate())
|
||||||
|
|
||||||
if data == 'SOCKETTEST':
|
if data == 'SOCKETTEST':
|
||||||
response = bytes("WELL DONE! YOU ARE ABLE TO COMMUNICATE WITH THE TNC", 'utf-8')
|
cur_thread = threading.current_thread()
|
||||||
|
response = bytes("WELL DONE! YOU ARE ABLE TO COMMUNICATE WITH THE TNC ---THREAD: " + str(cur_thread), 'utf-8')
|
||||||
|
|
||||||
self.request.sendall(response)
|
self.request.sendall(response)
|
||||||
|
|
||||||
# TRANSMIT ARQ MESSAGE
|
# TRANSMIT ARQ MESSAGE
|
||||||
if data.startswith('ARQ:'):
|
if data.startswith('ARQ:'):
|
||||||
logging.info("CMD | NEW ARQ DATA")
|
logging.info("CMD | NEW ARQ DATA")
|
||||||
|
|
||||||
data = data.split('ARQ:')
|
arqdata = data.split('ARQ:')
|
||||||
data_out = bytes(data[1], 'utf-8')
|
data_out = bytes(arqdata[1], 'utf-8')
|
||||||
|
|
||||||
TRANSMIT_ARQ = threading.Thread(target=arq.transmit, args=[data_out], name="TRANSMIT_ARQ")
|
TRANSMIT_ARQ = threading.Thread(target=arq.transmit, args=[data_out], name="TRANSMIT_ARQ")
|
||||||
TRANSMIT_ARQ.start()
|
TRANSMIT_ARQ.start()
|
||||||
|
@ -100,15 +102,24 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
if data.startswith('GET:RX_BUFFER:'):
|
if data.startswith('GET:RX_BUFFER:'):
|
||||||
|
|
||||||
data = data.split('GET:RX_BUFFER:')
|
data = data.split('GET:RX_BUFFER:')
|
||||||
bufferposition = data[1]
|
bufferposition = int(data[1])
|
||||||
|
print(static.RX_BUFFER)
|
||||||
if bufferposition == 0:
|
if bufferposition == -1:
|
||||||
if len(static.RX_BUFFER) > 0:
|
if len(static.RX_BUFFER) > 0:
|
||||||
self.request.sendall(static.RX_BUFFER[-1])
|
self.request.sendall(static.RX_BUFFER[-1])
|
||||||
else:
|
else:
|
||||||
if len(static.RX_BUFFER) > 0:
|
if bufferposition >= len(static.RX_BUFFER) > 0:
|
||||||
|
#print(static.RX_BUFFER[0])
|
||||||
|
#print(static.RX_BUFFER[1])
|
||||||
|
#print(static.RX_BUFFER[2])
|
||||||
|
#print(type(bufferposition))
|
||||||
|
#print(bufferposition)
|
||||||
self.request.sendall(static.RX_BUFFER[bufferposition])
|
self.request.sendall(static.RX_BUFFER[bufferposition])
|
||||||
|
|
||||||
|
#quit()
|
||||||
|
|
||||||
|
#self.request.close()
|
||||||
|
#cur_thread.close()
|
||||||
|
|
||||||
class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
||||||
socketserver.TCPServer.allow_reuse_address = True
|
socketserver.TCPServer.allow_reuse_address = True
|
||||||
|
|
|
@ -7,11 +7,11 @@ Created on Wed Dec 23 11:13:57 2020
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Operator Defaults
|
# Operator Defaults
|
||||||
MYCALLSIGN = b''
|
MYCALLSIGN = b'AA0AA'
|
||||||
MYCALLSIGN_CRC8 = b''
|
MYCALLSIGN_CRC8 = b'A'
|
||||||
|
|
||||||
DXCALLSIGN = b''
|
DXCALLSIGN = b'AA0AA'
|
||||||
DXCALLSIGN_CRC8 = b''
|
DXCALLSIGN_CRC8 = b'A'
|
||||||
|
|
||||||
MYGRID = b''
|
MYGRID = b''
|
||||||
#---------------------------------
|
#---------------------------------
|
||||||
|
|
Loading…
Reference in a new issue