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 Projects Releases Packages Wiki Activity

adjusted remote tnc connection

Browse source
This commit is contained in:
DJ2LS 2023-09-09 07:48:29 +02:00
parent 591d29cc20
commit d41a9acbad
5 changed files with 38 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
gui_vue/src/components/settings_tnc.vue
View file

@ -17,101 +17,39 @@ function saveSettings(){
<template>
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">TNC IP</label>
<div
class="btn-group btn-group-sm me-2"
role="group"
aria-label="local-remote-switch toggle button group"
data-bs-placement="bottom"
data-bs-toggle="tooltip"
data-bs-trigger="hover"
data-bs-html="true"
title="Select a local or a remote location of your TNC daemon. Normally local is the preferred option."
<div class="input-group input-group-sm mb-1">
<span class="input-group-text" style="width: 180px"
>TNC address</span
>
<input
type="radio"
class="btn-check"
name="local-remote-switch"
id="local-remote-switch1"
autocomplete="off"
@change="saveSettings"
/>
<label
class="btn btn-sm btn-outline-secondary"
for="local-remote-switch1"
>
<i class="bi bi-pc-display-horizontal"></i>
<span class="ms-2 me-2">Local tnc</span>
</label>
<input
type="radio"
class="btn-check"
name="local-remote-switch"
id="local-remote-switch2"
autocomplete="off"
@change="saveSettings"
/>
<label
class="btn btn-sm btn-outline-secondary"
for="local-remote-switch2"
>
<i class="bi bi-ethernet"></i>
<span class="ms-2 me-2">Remote tnc</span>
</label>
</div>
<div class="input-group input-group-sm me-2" id="remote-tnc-field">
<span class="input-group-text">tnc ip</span>
<input
type="text"
class="form-control"
placeholder="ip address"
id="tnc_adress"
maxlength="17"
style="width: 8rem"
aria-label="Username"
aria-describedby="basic-addon1"
@change="saveSettings"
v-model="settings.tnc_host"
/>
<span class="input-group-text">:</span>
<input
type="text"
class="form-control"
placeholder="port"
id="tnc_port"
<input
type="text"
class="form-control"
placeholder="tnc port"
id="tnc_port"
maxlength="5"
max="65534"
min="1025"
style="width: 4rem"
aria-label="Username"
aria-describedby="basic-addon1"
@change="saveSettings"
@change="saveSettings"
v-model="settings.tnc_port"
/>
<button
class="btn btn-sm btn-danger"
id="daemon_connection_state"
type="button"
disabled
>
<i class="bi bi-diagram-3" style="font-size: 1rem"></i>
</button>
</div>
<button
type="button"
id="openHelpModalLocalRemote"
data-bs-toggle="modal"
data-bs-target="#localRemoteHelpModal"
class="btn m-0 p-0 border-0"
>
<i class="bi bi-question-circle" style="font-size: 1rem"></i>
</button>
/>
</div>
<div class="input-group input-group-sm mb-1">
<span class="input-group-text" style="width: 180px"
>TNC port</span
>
<input
type="text"
class="form-control"
placeholder="tnc host"
id="tnc_port"
@change="saveSettings"
v-model="settings.tnc_host"
/>
</div>
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">TX delay in ms</label>
<select class="form-select form-select-sm" id="tx_delay" @change="saveSettings"

7
gui_vue/src/js/daemon.js
View file

@ -33,11 +33,8 @@ function connectDAEMON() {
//clear message buffer after reconnecting or initial connection
socketchunk = "";
if (settings.tnclocation == "localhost") {
daemon.connect(3001, "127.0.0.1");
} else {
daemon.connect(daemon_port, daemon_host);
}
daemon.connect(settings.daemon_port, settings.daemon_host);
//client.setTimeout(5000);
}

1
gui_vue/src/js/settingsHandler.js
View file

@ -55,7 +55,6 @@ const configDefaultSettings =
"tci_port" : "50001",\
"tci_ip" : "127.0.0.1",\
"spectrum": "waterfall",\
"tnclocation": "localhost",\
"enable_scatter" : "False",\
"enable_fft" : "False",\
"enable_fsk" : "False",\

8
gui_vue/src/js/sock.js
View file

@ -43,11 +43,9 @@ function connectTNC() {
//clear message buffer after reconnecting or initial connection
socketchunk = "";
if (settings.tnclocation == "localhost") {
client.connect(3000, "127.0.0.1");
} else {
client.connect(settings.tnc_port, settings.tnc_host);
}
client.connect(settings.tnc_port, settings.tnc_host);
}
client.on("connect", function (data) {

15
gui_vue/src/store/settingsStore.js
View file

@ -7,9 +7,8 @@ export const useSettingsStore = defineStore('settingsStore', () => {
// network
var tnc_host = ref("127.0.0.1")
var tnc_port = ref(3000)
var daemon_host = ref("127.0.0.1")
var daemon_port = ref(3001)
var tnclocation = ref("localhost")
var daemon_host = ref(tnc_host.value)
var daemon_port = ref(tnc_port.value + 1)
// app
var screen_height = ref(430)
@ -78,12 +77,16 @@ export const useSettingsStore = defineStore('settingsStore', () => {
var enable_mesh_features = ref("False")
function getJSON(){
var config_export = {
"tnc_host": tnc_host.value,
"tnc_port": tnc_port.value,
"daemon_host": daemon_host.value,
"daemon_port": daemon_port.value,
"daemon_host": tnc_host.value,
"daemon_port": tnc_port.value + 1,
"mycall": mycall.value,
"myssid": myssid.value,
"mygrid": mygrid.value,
@ -107,7 +110,6 @@ var config_export = {
"tci_port" : tci_port.value,
"tci_ip" : tci_ip.value,
"spectrum": spectrum.value,
"tnclocation": tnclocation.value,
"enable_scatter" : enable_scatter.value,
"enable_fft" : enable_fft.value,
"enable_fsk" : enable_fsk.value,
@ -150,7 +152,6 @@ var config_export = {
tnc_port,
daemon_host,
daemon_port,
tnclocation,
screen_height,
screen_width,
theme,