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

Prettified Code!

Browse source
This commit is contained in:
Mashintime 2023-04-26 01:19:02 +00:00 committed by GitHub Action
parent 9e03ef3da4
commit 56fb5536b0
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gui/main.js
View file

@ -952,8 +952,7 @@ ipcMain.on("request-check-rigctld", (event, data) => {
rigctld_events_wired = true;
mainLog.info("Starting rigctld event listeners");
rigctld_connection_state = true;
Data["state"] =
"Connected";
Data["state"] = "Connected";
Data["active"] = true;
if (win !== null && win !== "" && typeof win != "undefined") {
// try catch for being sure we have a clean app close

37
gui/preload-main.js
View file

@ -1249,7 +1249,7 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("discordUrl").addEventListener("click", () => {
shell.openExternal("https://discord.gg/jnADeDtxUF");
});
//Track the number of times TNC has been started
//So that warning is shown when using auto start and 2nd start
//if hamlib is not running
@ -1403,14 +1403,18 @@ window.addEventListener("DOMContentLoaded", () => {
FD.saveConfig(config, configPath);
//Display a message if hamlib control is enabled and not running
if (config.radiocontrol == "rigctld" && rigctldActive == false && (config.auto_start == 0 || tncStartCount > 1 )) {
if (
config.radiocontrol == "rigctld" &&
rigctldActive == false &&
(config.auto_start == 0 || tncStartCount > 1)
) {
if (
!window.confirm("Rig control is set to hamlib/rigctl, but it doesn't appear to be running.\n\nPlease start rigctld (start button in Rig Control area), or use rigctl mode 'none'. If you're having issues starting rigctld please review the Hamlib tab in settings.\n\nClick OK to continue or cancel to abort.")
!window.confirm(
"Rig control is set to hamlib/rigctl, but it doesn't appear to be running.\n\nPlease start rigctld (start button in Rig Control area), or use rigctl mode 'none'. If you're having issues starting rigctld please review the Hamlib tab in settings.\n\nClick OK to continue or cancel to abort."
)
{
return;
}
) {
return;
}
}
daemon.startTNC(
@ -3215,17 +3219,14 @@ function checkRigctld() {
ipcRenderer.on("action-check-rigctld", (event, data) => {
document.getElementById("hamlib_rigctld_status").value = data["state"];
rigctldActive = data["active"];
if (data["active"] == true)
{
document.getElementById("hamlib_rigctld_stop").disabled=false;
document.getElementById("hamlib_rigctld_start").disabled=true;
document.getElementById("testHamlib").disabled=false;
} else {
document.getElementById("hamlib_rigctld_stop").disabled=true;
document.getElementById("hamlib_rigctld_start").disabled=false;
document.getElementById("testHamlib").disabled=true;
if (data["active"] == true) {
document.getElementById("hamlib_rigctld_stop").disabled = false;
document.getElementById("hamlib_rigctld_start").disabled = true;
document.getElementById("testHamlib").disabled = false;
} else {
document.getElementById("hamlib_rigctld_stop").disabled = true;
document.getElementById("hamlib_rigctld_start").disabled = false;
document.getElementById("testHamlib").disabled = true;
}
});

12
gui/src/index.html
View file

@ -472,12 +472,12 @@
Start
</button>
<button
class="btn btn-outline-danger"
type="button"
id="hamlib_rigctld_stop"
>
Stop
</button>
class="btn btn-outline-danger"
type="button"
id="hamlib_rigctld_stop"
>
Stop
</button>
<input
type="text"
class="form-control"