Improve audio settings and modem state handling

This commit is contained in:
Pedro 2023-11-03 15:38:41 +01:00
parent 99043037d9
commit 9a19c56af0
4 changed files with 28 additions and 12 deletions

View file

@ -20,13 +20,15 @@ import { saveSettingsToFile } from "../js/settingsHandler";
<template>
<nav class="navbar bg-body-tertiary border-bottom">
<div class="mx-auto">
<span class="badge bg-secondary me-4"
>Modem location | {{ settings.modem_host }}</span
>
<span class="badge bg-secondary me-4"
>Service | {{ state.modem_running_state }}</span
>
<span class="badge bg-secondary me-4">
Modem Connection {{ state.modem_connection }}
</span>
<span class="badge bg-secondary me-4">
Modem {{ state.modem_running_state }}
</span>
<span class="badge bg-secondary me-4">
RIG Control {{ state.rigctld_started }}
</span>
</div>
</nav>
</nav>
</template>

View file

@ -99,9 +99,10 @@ function saveSettings() {
<label class="input-group-text w-50">Audio Input device</label>
<select
class="form-select form-select-sm"
id="audio_input_selectbox"
id="rx_audio"
aria-label=".form-select-sm"
@change="saveSettings"
v-model="settings.rx_audio"
v-html="audio.getInputDevices()"
>
</select>
@ -112,9 +113,10 @@ function saveSettings() {
<label class="input-group-text w-50">Audio Output device</label>
<select
class="form-select form-select-sm"
id="audio_output_selectbox"
id="tx_audio"
aria-label=".form-select-sm"
@change="saveSettings"
v-model="settings.tx_audio"
v-html="audio.getOutputDevices()"
>
</select>

View file

@ -37,6 +37,7 @@ function connectDAEMON() {
daemon.on("connect", function () {
console.log("daemon connection established");
state.modem_connection = "connected";
daemonShowConnectStateError = 1;
});
@ -147,6 +148,16 @@ daemon.on("data", function (socketdata) {
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
@ -164,8 +175,8 @@ export function startModem() {
{
mycall: settings.mycall + "-" + settings.myssid,
mygrid: settings.mygrid,
rx_audio: audioStore.startupInputDevice,
tx_audio: audioStore.startupOutputDevice,
rx_audio: settings.rx_audio,
tx_audio: settings.tx_audio,
radiocontrol: settings.radiocontrol,
devicename: settings.hamlib_deviceid,
deviceport: settings.hamlib_deviceport,

View file

@ -124,6 +124,7 @@ export const useStateStore = defineStore("stateStore", () => {
arq_seconds_until_finish,
arq_seconds_until_timeout,
arq_seconds_until_timeout_percent,
modem_connection,
modem_running_state,
arq_session_state,
is_codec2_traffic,