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

Hamlib: use long options. no autoquote on windows.

Browse source
This commit is contained in:
Mashintime 2023-02-16 18:13:26 -05:00
parent 0f45be5d8d
commit c708bad1ad
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/main.js
View file

@ -794,7 +794,9 @@ function close_all() {
// RUN RIGCTLD // RUN RIGCTLD
ipcMain.on("request-start-rigctld", (event, data) => { ipcMain.on("request-start-rigctld", (event, data) => {
try { try {
let rigctld_proc = spawn(data.path, data.parameters); let rigctld_proc = spawn(data.path, data.parameters, {
windowsVerbatimArguments: true,
});
rigctld_proc.on("exit", function (code) { rigctld_proc.on("exit", function (code) {
console.log("rigctld process exited with code " + code); console.log("rigctld process exited with code " + code);

10
gui/preload-main.js
View file

@ -610,20 +610,20 @@ window.addEventListener("DOMContentLoaded", () => {
var paramList = []; var paramList = [];
var hamlib_deviceid = document.getElementById("hamlib_deviceid").value; var hamlib_deviceid = document.getElementById("hamlib_deviceid").value;
paramList = paramList.concat("-m", hamlib_deviceid); paramList = paramList.concat("--model="+ hamlib_deviceid);
// hamlib deviceport setting // hamlib deviceport setting
if (document.getElementById("hamlib_deviceport").value !== "ignore") { if (document.getElementById("hamlib_deviceport").value !== "ignore") {
var hamlib_deviceport = var hamlib_deviceport =
document.getElementById("hamlib_deviceport").value; document.getElementById("hamlib_deviceport").value;
paramList = paramList.concat("-r", hamlib_deviceport); paramList = paramList.concat("--rig-file="+ hamlib_deviceport);
} }
// hamlib serialspeed setting // hamlib serialspeed setting
if (document.getElementById("hamlib_serialspeed").value !== "ignore") { if (document.getElementById("hamlib_serialspeed").value !== "ignore") {
var hamlib_serialspeed = var hamlib_serialspeed =
document.getElementById("hamlib_serialspeed").value; document.getElementById("hamlib_serialspeed").value;
paramList = paramList.concat("-s", hamlib_serialspeed); paramList = paramList.concat("--serial-speed="+ hamlib_serialspeed);
} }
// hamlib databits setting // hamlib databits setting
@ -655,7 +655,7 @@ window.addEventListener("DOMContentLoaded", () => {
// hamlib ptt port // hamlib ptt port
if (document.getElementById("hamlib_ptt_port").value !== "ignore") { if (document.getElementById("hamlib_ptt_port").value !== "ignore") {
var hamlib_ptt_port = document.getElementById("hamlib_ptt_port").value; var hamlib_ptt_port = document.getElementById("hamlib_ptt_port").value;
paramList = paramList.concat("-p", hamlib_ptt_port); paramList = paramList.concat("--ptt-file="+ hamlib_ptt_port);
} }
// hamlib ptt type // hamlib ptt type
@ -673,7 +673,7 @@ window.addEventListener("DOMContentLoaded", () => {
var hamlib_rigctld_server_port = document.getElementById( var hamlib_rigctld_server_port = document.getElementById(
"hamlib_rigctld_server_port" "hamlib_rigctld_server_port"
).value; ).value;
paramList = paramList.concat("-t", hamlib_rigctld_server_port); paramList = paramList.concat("--port=" + hamlib_rigctld_server_port);
//Custom rigctld arguments to pass to rigctld //Custom rigctld arguments to pass to rigctld
var hamlib_rigctld_custom_args = document.getElementById( var hamlib_rigctld_custom_args = document.getElementById(