purge some file and variables

This commit is contained in:
F4HTB 2020-11-23 16:39:07 +00:00
parent 80348273f7
commit 9f38dd82f4
14 changed files with 21 additions and 24 deletions

34
UHRR
View File

@ -33,9 +33,13 @@ def writte_log(logmsg):
logfile.write(msg)
print(msg)
logfile.close()
############ Generate and send FFT from RTLSDR ##############
############ BaseHandler tornado ##############
class BaseHandler(tornado.web.RequestHandler):
def get_current_user(self):
return self.get_secure_cookie("user")
############ Generate and send FFT from RTLSDR ##############
is_rtlsdr_present = True
try:
@ -161,7 +165,7 @@ class loadFFTdata(threading.Thread):
fftpaquetlen=int(FFTSIZE*8/2048)
class panFFTHandler(tornado.websocket.WebSocketHandler):
class WS_panFFTHandler(tornado.websocket.WebSocketHandler):
@tornado.gen.coroutine
def sendFFT(self):
@ -220,7 +224,7 @@ class loadWavdata(threading.Thread):
time.sleep(0.01)
class AudioRXHandler(tornado.websocket.WebSocketHandler):
class WS_AudioRXHandler(tornado.websocket.WebSocketHandler):
def open(self):
self.set_nodelay(True)
@ -254,7 +258,7 @@ class AudioRXHandler(tornado.websocket.WebSocketHandler):
last_AudioTXHandler_msg_time=0
AudioTXHandlerClients = []
class AudioTXHandler(tornado.websocket.WebSocketHandler):
class WS_AudioTXHandler(tornado.websocket.WebSocketHandler):
def stoppttontimeout(self):
global last_AudioTXHandler_msg_time
@ -435,7 +439,7 @@ class ticksTRXRIG(threading.Thread):
CTRX.getStrgLVL()
time.sleep(0.1)
class ControlTRX(tornado.websocket.WebSocketHandler):
class WS_ControlTRX(tornado.websocket.WebSocketHandler):
def send_to_all_clients(self,msg):
print ("Send to all: "+msg)
@ -510,11 +514,6 @@ class threadtimeoutTRXshutdown(threading.Thread):
time.sleep(60)
timeoutTRXshutdown()
############ BaseHandler tornado ##############
class BaseHandler(tornado.web.RequestHandler):
def get_current_user(self):
return self.get_secure_cookie("user")
############ Config ##############
class ConfigHandler(BaseHandler):
def get(self):
@ -718,12 +717,13 @@ if __name__ == "__main__":
app = tornado.web.Application([
(r"/login", AuthLoginHandler),
(r"/logout", AuthLogoutHandler),
(r'/audioRX', AudioRXHandler),
(r'/audioTX', AudioTXHandler),
(r'/CTRX', ControlTRX),
(r'/panFFT', panFFTHandler),
(r'/login', AuthLoginHandler),
(r'/logout', AuthLogoutHandler),
(r'/WSaudioRX', WS_AudioRXHandler),
(r'/WSaudioTX', WS_AudioTXHandler),
(r'/WSCTRX', WS_ControlTRX),
(r'/WSpanFFT', WS_panFFTHandler),
(r'/(panfft.*)', tornado.web.StaticFileHandler, { 'path' : './www/panadapter' }),
(r'/CONFIG', ConfigHandler),
(r'/', MainHandler),
(r'/(.*)', tornado.web.StaticFileHandler, { 'path' : './www' })

View File

@ -1,3 +0,0 @@
<html>
aaa
</html>

6
www/controls.js vendored
View File

@ -151,7 +151,7 @@ function AudioRX_start(){
document.getElementById("indwsAudioRX").innerHTML='<img src="img/critsgrey.png">wsRX';
AudioRX_audiobuffer = [];var lenglitchbuf = 2;
wsAudioRX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/audioRX' );
wsAudioRX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/WSaudioRX' );
wsAudioRX.binaryType = 'arraybuffer';
wsAudioRX.onmessage = appendwsAudioRX;
wsAudioRX.onopen = wsAudioRXopen;
@ -379,7 +379,7 @@ var wsControlTRX = "";
function ControlTRX_start(){
document.getElementById("indwsControlTRX").innerHTML='<img src="img/critsgrey.png">wsCtrl';
wsControlTRX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/CTRX' );
wsControlTRX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/WSCTRX' );
wsControlTRX.onopen = wsControlTRXopen;
wsControlTRX.onclose = wsControlTRXclose;
wsControlTRX.onerror = wsControlTRXerror;
@ -1189,7 +1189,7 @@ function AudioTX_start()
isRecording = false;
encode = false;
document.getElementById("indwsAudioTX").innerHTML='<img src="img/critsgrey.png">wsTX';
wsAudioTX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/audioTX' );
wsAudioTX = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/WSaudioTX' );
wsAudioTX.onopen = appendwsAudioTXOpen;
wsAudioTX.onerror = appendwsAudioTXError;
wsAudioTX.onclose = appendwsAudioTXclose;

View File

@ -35,7 +35,7 @@ function set_FFT_Viso_min(v){FFT_Viso_min=v;}
function startFFT(){
document.getElementById("div-scoketscontrols").innerHTML='<img src="img/critsgrey.png">wsFFT';
wshFFT = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/panFFT' );
wshFFT = new WebSocket( 'wss://' + window.location.href.split( '/' )[2] + '/WSpanFFT' );
wshFFT.onopen = appendwshFFTOpen;
wshFFT.onmessage = init_showFFT;
wshFFT.onerror = appendwshFFTError;