diff --git a/tools/tnc_gui/tnc_gui.glade b/tools/tnc_gui/tnc_gui.glade index 042b62eb..a748604c 100644 --- a/tools/tnc_gui/tnc_gui.glade +++ b/tools/tnc_gui/tnc_gui.glade @@ -4,9 +4,10 @@ False - False - 650 + FreeDV JATE + 1000 400 + face-smile @@ -16,19 +17,6 @@ False 200 200 - - - 430 - 34 - True - False - True - - - 16 - 488 - - 464 @@ -38,6 +26,7 @@ start + 150 True False ARQ CMD @@ -110,6 +99,7 @@ + 15 136 @@ -120,6 +110,22 @@ True False start + + + 150 + True + False + MY STATION + + + + + + True + True + 0 + + True @@ -132,7 +138,7 @@ True True - 0 + 1 @@ -150,22 +156,37 @@ True True - 1 + 2 - 10 + 15 51 - 108 80 True False start + + + 150 + True + False + BROADCAST + + + + + + True + True + 0 + + CQ CQ CQ @@ -177,17 +198,17 @@ True True - 0 + 1 - 10 + 15 93 - + 378 80 True @@ -195,6 +216,7 @@ start + 150 True False ARQ DATA @@ -239,8 +261,22 @@ 2 + + + True + False + True + + + True + True + 3 + True + + + 15 175 @@ -254,6 +290,7 @@ True + 150 True False ARQ @@ -279,6 +316,7 @@ + 150 True False CHANNEL @@ -304,6 +342,7 @@ + 150 True False TNC @@ -329,6 +368,7 @@ + 150 True False PTT @@ -367,9 +407,11 @@ start + 150 True False CONNECTION + True @@ -416,6 +458,48 @@ 15 + + + 403 + 80 + True + False + start + + + True + False + RMS + + + + + + True + True + 0 + + + + + 310 + 34 + True + False + True + 10000 + + + True + True + 1 + + + + + 487 + + diff --git a/tools/tnc_gui/tnc_gui.py b/tools/tnc_gui/tnc_gui.py index 53287760..5f1a3f75 100644 --- a/tools/tnc_gui/tnc_gui.py +++ b/tools/tnc_gui/tnc_gui.py @@ -25,19 +25,21 @@ def create_string(length): def send_command(command): - - ip, port = builder.get_object('host').get_text(), int(builder.get_object('port').get_text()) - try: - with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: - sock.connect((ip, port)) - if isinstance(command, str): - command = bytes(command, 'utf-8') + while True: + ip, port = builder.get_object('host').get_text(), int(builder.get_object('port').get_text()) + try: + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: + sock.connect((ip, port)) + if isinstance(command, str): + command = bytes(command, 'utf-8') - sock.sendall(command + b'\n') + sock.sendall(command + b'\n') + print("done.....") + break #response = str(sock.recv(1024), 'utf-8') - sock.close() - except: - pass + #sock.close() + except: + pass def get_tnc_state(): @@ -66,9 +68,9 @@ def get_tnc_state_worker(): builder.get_object('tnc_state').set_text(received_json["TNC_STATE"]) builder.get_object('arq_state').set_text(received_json["ARQ_STATE"]) - builder.get_object('levelbar').set_min_value(0.0) - builder.get_object('levelbar').set_max_value(10.0) - builder.get_object('levelbar').set_value(received_json["AUDIO_RMS"]) + #builder.get_object('levelbar').set_min_value(0.0) + #builder.get_object('levelbar').set_max_value(10000.0) + builder.get_object('levelbar').set_value(int(received_json["AUDIO_RMS"])) sock.close() except: