new commands

This commit is contained in:
DJ2LS 2021-02-16 20:49:02 +01:00 committed by GitHub
parent 2b708f8453
commit 533d797be3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

70
sock.py
View file

@ -13,11 +13,15 @@ import time
import static
import arq
import helpers
class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
def handle(self):
encoding = 'utf-8'
data = str(self.request.recv(1024), 'utf-8')
#cur_thread = threading.current_thread()
#response = bytes("{}: {}".format(cur_thread.name, data), 'ascii')
@ -37,7 +41,73 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
TRANSMIT_ARQ = threading.Thread(target=arq.transmit, args=[data_out], name="TRANSMIT_ARQ")
TRANSMIT_ARQ.start()
# SETTINGS AND STATUS
if data.startswith('SET:MYCALLSIGN:'):
data = data.split('SET:MYCALLSIGN:')
static.MYCALLSIGN = bytes(data[1], encoding)
static.MYCALLSIGN_CRC8 = helpers.get_crc_8(static.MYCALLSIGN)
#self.request.sendall(bytes(static.MYCALLSIGN, encoding))
self.request.sendall(static.MYCALLSIGN)
logging.info("CMD | MYCALLSIGN: " + str(static.MYCALLSIGN))
if data == 'GET:MYCALLSIGN':
self.request.sendall(bytes(static.MYCALLSIGN, encoding))
if data == 'GET:MYCALLSIGN_CRC8':
self.request.sendall(bytes(static.MYCALLSIGN_CRC8, encoding))
if data == 'GET:DXCALLSIGN':
self.request.sendall(bytes(static.DXCALLSIGN, encoding))
# ARQ
if data == 'GET:ARQ_STATE':
self.request.sendall(bytes(static.ARQ_STATE, encoding))
if data == 'GET:TX_N_MAX_RETRIES':
self.request.sendall(bytes([static.TX_N_MAX_RETRIES], encoding))
if data == 'GET:TX_N_RETRIES':
self.request.sendall(bytes([static.TX_N_RETRIES], encoding))
if data == 'GET:ARQ_TX_N_FRAMES_PER_BURST':
self.request.sendall(bytes([static.ARQ_TX_N_FRAMES_PER_BURST], encoding))
if data == 'GET:ARQ_TX_N_BURSTS':
self.request.sendall(bytes([static.ARQ_TX_N_BURSTS], encoding))
if data == 'GET:ARQ_TX_N_CURRENT_ARQ_FRAME':
self.request.sendall(bytes([static.ARQ_TX_N_CURRENT_ARQ_FRAME], encoding))
if data == 'GET:ARQ_TX_N_TOTAL_ARQ_FRAMES':
self.request.sendall(bytes([static.ARQ_TX_N_TOTAL_ARQ_FRAMES], encoding))
if data == 'GET:ARQ_RX_FRAME_N_BURSTS':
self.request.sendall(bytes([static.ARQ_RX_FRAME_N_BURSTS], encoding))
if data == 'GET:ARQ_RX_N_CURRENT_ARQ_FRAME':
self.request.sendall(bytes([static.ARQ_RX_N_CURRENT_ARQ_FRAME], encoding))
if data == 'GET:ARQ_N_ARQ_FRAMES_PER_DATA_FRAME':
self.request.sendall(bytes([static.ARQ_N_ARQ_FRAMES_PER_DATA_FRAME], encoding))
if data == 'GET:RX_BUFFER_LENGTH':
self.request.sendall(bytes(str(len(static.RX_BUFFER)),encoding))
if data.startswith('GET:RX_BUFFER:'):
data = data.split('GET:RX_BUFFER:')
bufferposition = data[1]
if bufferposition == 0:
if len(static.RX_BUFFER) > 0:
self.request.sendall(static.RX_BUFFER[-1])
else:
if len(static.RX_BUFFER) > 0:
self.request.sendall(static.RX_BUFFER[bufferposition])
class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):