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

Merge remote-tracking branch 'origin/ls-tci' into ls-tci

Browse source
This commit is contained in:
DJ2LS 2023-05-20 09:55:20 +02:00
parent 8d622e1f44 e90ff27498
commit 8ae556ffe9
3 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/daemon.js
View file

@ -263,7 +263,7 @@ exports.startTNC = function (
enable_auto_tune: auto_tune,
tx_delay: tx_delay,
tci_ip: tci_ip,
tci_port: tci_port
tci_port: tci_port,
},
],
});

34
gui/preload-main.js
View file

@ -250,10 +250,8 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("hamlib_rigctld_ip").value = config.hamlib_rigctld_ip;
document.getElementById("hamlib_rigctld_port").value =
config.hamlib_rigctld_port;
document.getElementById("tci_ip").value = config.tci_ip;
document.getElementById("tci_port").value =
config.tci_port;
document.getElementById("tci_ip").value = config.tci_ip;
document.getElementById("tci_port").value = config.tci_port;
document.getElementById("hamlib_rigctld_path").value =
config.hamlib_rigctld_path;
@ -451,7 +449,6 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("radio-control-switch-rigctld").checked = true;
document.getElementById("radio-control-switch-tci").checked = false;
document.getElementById("radio-control-disabled").style.visibility =
"hidden";
document.getElementById("radio-control-disabled").style.display = "none";
@ -465,7 +462,7 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("radio-control-rigctld").style.visibility =
"visible";
document.getElementById("radio-control-rigctld").style.display = "block";
} else if(config.radiocontrol == "tci"){
} else if (config.radiocontrol == "tci") {
document.getElementById("radio-control-switch-disabled").checked = false;
document.getElementById("radio-control-switch-rigctld").checked = false;
document.getElementById("radio-control-switch-tci").checked = true;
@ -476,13 +473,12 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("radio-control-help").style.visibility = "hidden";
document.getElementById("radio-control-help").style.display = "none";
document.getElementById("radio-control-rigctld").style.visibility = "hidden";
document.getElementById("radio-control-rigctld").style.visibility =
"hidden";
document.getElementById("radio-control-rigctld").style.display = "none";
document.getElementById("radio-control-tci").style.visibility =
"visible";
document.getElementById("radio-control-tci").style.visibility = "visible";
document.getElementById("radio-control-tci").style.display = "block";
} else {
document.getElementById("radio-control-switch-disabled").checked = true;
document.getElementById("radio-control-switch-rigctld").checked = false;
@ -621,13 +617,13 @@ window.addEventListener("DOMContentLoaded", () => {
"hidden";
document.getElementById("radio-control-rigctld").style.display = "none";
document.getElementById("radio-control-rigctld").style.visibility = "hidden";
document.getElementById("radio-control-rigctld").style.visibility =
"hidden";
document.getElementById("radio-control-help").style.display = "none";
document.getElementById("radio-control-help").style.visibility = "hidden";
document.getElementById("radio-control-tci").style.visibility =
"visible";
document.getElementById("radio-control-tci").style.visibility = "visible";
document.getElementById("radio-control-tci").style.display = "block";
config.radiocontrol = "tci";
@ -1370,7 +1366,7 @@ window.addEventListener("DOMContentLoaded", () => {
var rigctld_ip = document.getElementById("hamlib_rigctld_ip").value;
var rigctld_port = document.getElementById("hamlib_rigctld_port").value;
var tci_ip = document.getElementById("tci_ip").value;
var tci_ip = document.getElementById("tci_ip").value;
var tci_port = document.getElementById("tci_port").value;
var hamlib_rigctld_server_port = document.getElementById(
@ -1383,8 +1379,6 @@ window.addEventListener("DOMContentLoaded", () => {
var pttprotocol = document.getElementById("hamlib_pttprotocol").value;
var hamlib_dcd = document.getElementById("hamlib_dcd").value;
var mycall = document.getElementById("myCall").value;
var ssid = document.getElementById("myCallSSID").value;
callsign_ssid = mycall.toUpperCase() + "-" + ssid;
@ -1475,14 +1469,12 @@ window.addEventListener("DOMContentLoaded", () => {
}
}
if (document.getElementById("radio-control-switch-rigctld").checked) {
var radiocontrol = "rigctld";
var radiocontrol = "rigctld";
} else if (document.getElementById("radio-control-switch-tci").checked) {
var radiocontrol = "tci";
var radiocontrol = "tci";
} else {
var radiocontrol = "disabled";
var radiocontrol = "disabled";
}
var tx_audio_level = document.getElementById("audioLevelTX").value;

1
gui/src/index.html
View file

@ -535,7 +535,6 @@
aria-label="Device IP"
aria-describedby="basic-addon1"
/>
</div>
<div class="input-group input-group-sm mb-1">