Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
DJ2LS 2024-01-12 17:00:34 +01:00
commit f85e032e2f
3 changed files with 9 additions and 13 deletions

View file

@ -1,15 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { setActivePinia } from "pinia"; import { setActivePinia } from "pinia";
import pinia from "../../store/index"; import pinia from "../../store/index";
import { setRadioParameters} from "../../js/api"; import { setRadioParameters } from "../../js/api";
setActivePinia(pinia); setActivePinia(pinia);
import { useStateStore } from "../../store/stateStore.js"; import { useStateStore } from "../../store/stateStore.js";
const state = useStateStore(pinia); const state = useStateStore(pinia);
function set_radio_parameters(){ function set_radio_parameters() {
setRadioParameters(state.frequency, state.mode, state.rf_level); setRadioParameters(state.frequency, state.mode, state.rf_level);
} }
</script> </script>

View file

@ -6,19 +6,16 @@ setActivePinia(pinia);
import { useStateStore } from "../store/stateStore.js"; import { useStateStore } from "../store/stateStore.js";
const state = useStateStore(pinia); const state = useStateStore(pinia);
import { setRadioParameters} from "../js/api"; import { setRadioParameters } from "../js/api";
function updateFrequencyAndApply(frequency) { function updateFrequencyAndApply(frequency) {
state.new_frequency = frequency; state.new_frequency = frequency;
set_radio_parameters(); set_radio_parameters();
} }
function set_radio_parameters() {
function set_radio_parameters(){ setRadioParameters(state.new_frequency, state.mode, state.rf_level);
setRadioParameters(state.new_frequency, state.mode, state.rf_level);
} }
</script> </script>
<template> <template>

View file

@ -117,7 +117,7 @@ export function getModemState() {
return apiGet("/modem/state"); return apiGet("/modem/state");
} }
export function setRadioParameters(frequency, mode, rf_level){ export function setRadioParameters(frequency, mode, rf_level) {
return apiPost("/radio", { return apiPost("/radio", {
radio_frequency: frequency, radio_frequency: frequency,
radio_mode: mode, radio_mode: mode,
@ -125,4 +125,4 @@ export function setRadioParameters(frequency, mode, rf_level){
} }
export function getRadioStatus() { export function getRadioStatus() {
return apiGet("/radio"); return apiGet("/radio");
} }