mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Improve audio settings and modem state handling
This commit is contained in:
parent
99043037d9
commit
9a19c56af0
4 changed files with 28 additions and 12 deletions
|
@ -20,13 +20,15 @@ import { saveSettingsToFile } from "../js/settingsHandler";
|
||||||
<template>
|
<template>
|
||||||
<nav class="navbar bg-body-tertiary border-bottom">
|
<nav class="navbar bg-body-tertiary border-bottom">
|
||||||
<div class="mx-auto">
|
<div class="mx-auto">
|
||||||
<span class="badge bg-secondary me-4"
|
<span class="badge bg-secondary me-4">
|
||||||
>Modem location | {{ settings.modem_host }}</span
|
Modem Connection {{ state.modem_connection }}
|
||||||
>
|
</span>
|
||||||
|
<span class="badge bg-secondary me-4">
|
||||||
<span class="badge bg-secondary me-4"
|
Modem {{ state.modem_running_state }}
|
||||||
>Service | {{ state.modem_running_state }}</span
|
</span>
|
||||||
>
|
<span class="badge bg-secondary me-4">
|
||||||
|
RIG Control {{ state.rigctld_started }}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -99,9 +99,10 @@ function saveSettings() {
|
||||||
<label class="input-group-text w-50">Audio Input device</label>
|
<label class="input-group-text w-50">Audio Input device</label>
|
||||||
<select
|
<select
|
||||||
class="form-select form-select-sm"
|
class="form-select form-select-sm"
|
||||||
id="audio_input_selectbox"
|
id="rx_audio"
|
||||||
aria-label=".form-select-sm"
|
aria-label=".form-select-sm"
|
||||||
@change="saveSettings"
|
@change="saveSettings"
|
||||||
|
v-model="settings.rx_audio"
|
||||||
v-html="audio.getInputDevices()"
|
v-html="audio.getInputDevices()"
|
||||||
>
|
>
|
||||||
</select>
|
</select>
|
||||||
|
@ -112,9 +113,10 @@ function saveSettings() {
|
||||||
<label class="input-group-text w-50">Audio Output device</label>
|
<label class="input-group-text w-50">Audio Output device</label>
|
||||||
<select
|
<select
|
||||||
class="form-select form-select-sm"
|
class="form-select form-select-sm"
|
||||||
id="audio_output_selectbox"
|
id="tx_audio"
|
||||||
aria-label=".form-select-sm"
|
aria-label=".form-select-sm"
|
||||||
@change="saveSettings"
|
@change="saveSettings"
|
||||||
|
v-model="settings.tx_audio"
|
||||||
v-html="audio.getOutputDevices()"
|
v-html="audio.getOutputDevices()"
|
||||||
>
|
>
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -37,6 +37,7 @@ function connectDAEMON() {
|
||||||
|
|
||||||
daemon.on("connect", function () {
|
daemon.on("connect", function () {
|
||||||
console.log("daemon connection established");
|
console.log("daemon connection established");
|
||||||
|
state.modem_connection = "connected";
|
||||||
daemonShowConnectStateError = 1;
|
daemonShowConnectStateError = 1;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -147,6 +148,16 @@ daemon.on("data", function (socketdata) {
|
||||||
if (data["command"] == "test_hamlib") {
|
if (data["command"] == "test_hamlib") {
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data["command_response"] == "stop_modem") {
|
||||||
|
switch (data["status"]) {
|
||||||
|
case "OK":
|
||||||
|
state.modem_running_state = "running";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
state.modem_running_state = "stopped";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//finally delete message buffer
|
//finally delete message buffer
|
||||||
|
@ -164,8 +175,8 @@ export function startModem() {
|
||||||
{
|
{
|
||||||
mycall: settings.mycall + "-" + settings.myssid,
|
mycall: settings.mycall + "-" + settings.myssid,
|
||||||
mygrid: settings.mygrid,
|
mygrid: settings.mygrid,
|
||||||
rx_audio: audioStore.startupInputDevice,
|
rx_audio: settings.rx_audio,
|
||||||
tx_audio: audioStore.startupOutputDevice,
|
tx_audio: settings.tx_audio,
|
||||||
radiocontrol: settings.radiocontrol,
|
radiocontrol: settings.radiocontrol,
|
||||||
devicename: settings.hamlib_deviceid,
|
devicename: settings.hamlib_deviceid,
|
||||||
deviceport: settings.hamlib_deviceport,
|
deviceport: settings.hamlib_deviceport,
|
||||||
|
|
|
@ -124,6 +124,7 @@ export const useStateStore = defineStore("stateStore", () => {
|
||||||
arq_seconds_until_finish,
|
arq_seconds_until_finish,
|
||||||
arq_seconds_until_timeout,
|
arq_seconds_until_timeout,
|
||||||
arq_seconds_until_timeout_percent,
|
arq_seconds_until_timeout_percent,
|
||||||
|
modem_connection,
|
||||||
modem_running_state,
|
modem_running_state,
|
||||||
arq_session_state,
|
arq_session_state,
|
||||||
is_codec2_traffic,
|
is_codec2_traffic,
|
||||||
|
|
Loading…
Reference in a new issue