Eliminate multiple GET /config requests

This commit is contained in:
Pedro 2023-11-18 16:58:17 +01:00
parent 381c0d7813
commit e861dde9c8
4 changed files with 9 additions and 27 deletions

View file

@ -3,8 +3,6 @@ import { setActivePinia } from "pinia";
import pinia from "../store/index";
setActivePinia(pinia);
import { getRemote } from "../store/settingsStore";
import main_modals from "./main_modals.vue";
import main_top_navbar from "./main_top_navbar.vue";
import main_rig_control from "./main_rig_control.vue";
@ -19,9 +17,7 @@ import main_active_audio_level from "./main_active_audio_level.vue";
import chat from "./chat.vue";
import infoScreen from "./infoScreen.vue";
import main_modem_healthcheck from "./main_modem_healthcheck.vue";
getRemote();
function stopAllTransmissions() {
console.log("stopping transmissions");

View file

@ -25,10 +25,7 @@ var updateAvailable = process.env.FDUpdateAvail;
// start modemCheck modal once on startup
onMounted(() => {
getModemConfig();
getModemCurrentState();
getModemVersion();
getConfig();
getVersion();
new Modal("#modemCheck", {}).show();
});
@ -45,20 +42,21 @@ function getNetworkState() {
}
function getRigControlStuff() {
switch (settings.radiocontrol) {
switch (settings.remote.RADIO.radiocontrol) {
case "disabled":
return true;
case "rigctld":
if (state.rigctld_started == "true") {
if (state.rigctld_started === true) {
return true;
} else {
return false;
}
case "tci":
return true;
break;
default:
console.error("Unknown radio control mode " + settings.radiocontrol);
console.error(
"Unknown radio control mode " + settings.remote.RADIO.radiocontrol,
);
return "Unknown control type";
}
}

View file

@ -6,7 +6,7 @@ import { setActivePinia } from "pinia";
import pinia from "../store/index";
setActivePinia(pinia);
import { settingsStore as settings} from "../store/settingsStore.js";
import { settingsStore as settings } from "../store/settingsStore.js";
import { useAudioStore } from "../store/audioStore.js";
const audioStore = useAudioStore(pinia);
@ -145,20 +145,6 @@ export function processModemConfig(data) {
}
}
export function processModemAudioDevices(data) {
console.log(data);
audioStore.inputDevices = data["in"];
audioStore.outputDevices = data["out"];
}
export function processModemSerialDevices(data) {
settings.serial_devices = data;
}
export function processModemVersion(data) {
//data = JSON.parse(data);
stateStore.modem_version = data["version"];
}
export function getModemConfigAsJSON() {
// create json output from settings
// TODO Can we make this more dynamic? Maybe using a settings object?

View file

@ -16,4 +16,6 @@ export function getRemote() {
});
}
getRemote();
if (settingsStore.remote["STATION"] === undefined) {
getRemote();
}