fixing some typescript errors

This commit is contained in:
DJ2LS 2024-01-05 23:20:21 +01:00
parent 7ee4f6b61f
commit 2ccf41f674
5 changed files with 25 additions and 41 deletions

View file

@ -59,14 +59,14 @@ function saveSettings() {
maxlength="8" maxlength="8"
aria-label="Input group" aria-label="Input group"
aria-describedby="btnGroupAddon" aria-describedby="btnGroupAddon"
v-model="settings.mycall" v-model="settings.remote.STATION.mycall"
@input="saveSettings" @input="saveSettings"
/> />
<select <select
class="form-select form-select-sm" class="form-select form-select-sm"
aria-label=".form-select-sm" aria-label=".form-select-sm"
id="myCallSSID" id="myCallSSID"
v-model="settings.myssid" v-model="settings.remote.STATION.myssid"
@change="saveSettings" @change="saveSettings"
> >
<option selected value="0">0</option> <option selected value="0">0</option>
@ -109,7 +109,7 @@ function saveSettings() {
maxlength="6" maxlength="6"
aria-label="Input group" aria-label="Input group"
aria-describedby="btnGroupAddon" aria-describedby="btnGroupAddon"
v-model="settings.mygrid" v-model="settings.remote.STATION.mygrid"
@input="saveSettings" @input="saveSettings"
/> />
</div> </div>

View file

@ -16,7 +16,7 @@ function startStopRigctld() {
switch (state.rigctld_started) { switch (state.rigctld_started) {
case "stopped": case "stopped":
settings.hamlib_deviceport = (<HTMLInputElement>document.getElementById("hamlib_deviceport")).value; settings.remote.RADIO.serial_port = (<HTMLInputElement>document.getElementById("hamlib_deviceport")).value;
startRigctld(); startRigctld();
@ -34,17 +34,17 @@ function selectRadioControl() {
// @ts-expect-error // @ts-expect-error
switch (event.target.id) { switch (event.target.id) {
case "list-rig-control-none-list": case "list-rig-control-none-list":
settings.radiocontrol = "disabled"; settings.remote.RADIO.control = "disabled";
break; break;
case "list-rig-control-rigctld-list": case "list-rig-control-rigctld-list":
settings.radiocontrol = "rigctld"; settings.remote.RADIO.control = "rigctld";
break; break;
case "list-rig-control-tci-list": case "list-rig-control-tci-list":
settings.radiocontrol = "tci"; settings.remote.RADIO.control = "tci";
break; break;
default: default:
console.log("default=!=="); console.log("default=!==");
settings.radiocontrol = "disabled"; settings.remote.RADIO.control = "disabled";
} }
saveSettingsToFile(); saveSettingsToFile();
} }
@ -84,7 +84,7 @@ alert("not yet implemented")
href="#list-rig-control-none" href="#list-rig-control-none"
role="tab" role="tab"
aria-controls="list-rig-control-none" aria-controls="list-rig-control-none"
v-bind:class="{ active: settings.radiocontrol === 'disabled' }" v-bind:class="{ active: settings.remote.RADIO.control === 'disabled' }"
@click="selectRadioControl()" @click="selectRadioControl()"
>None</a >None</a
> >
@ -95,7 +95,7 @@ alert("not yet implemented")
href="#list-rig-control-rigctld" href="#list-rig-control-rigctld"
role="tab" role="tab"
aria-controls="list-rig-control-rigctld" aria-controls="list-rig-control-rigctld"
v-bind:class="{ active: settings.radiocontrol === 'rigctld' }" v-bind:class="{ active: settings.remote.RADIO.control === 'rigctld' }"
@click="selectRadioControl()" @click="selectRadioControl()"
>Rigctld</a >Rigctld</a
> >
@ -106,7 +106,7 @@ alert("not yet implemented")
href="#list-rig-control-tci" href="#list-rig-control-tci"
role="tab" role="tab"
aria-controls="list-rig-control-tci" aria-controls="list-rig-control-tci"
v-bind:class="{ active: settings.radiocontrol === 'tci' }" v-bind:class="{ active: settings.remote.RADIO.control === 'tci' }"
@click="selectRadioControl()" @click="selectRadioControl()"
>TCI</a >TCI</a
> >
@ -131,7 +131,7 @@ alert("not yet implemented")
<div class="tab-content" id="rig-control-nav-tabContent"> <div class="tab-content" id="rig-control-nav-tabContent">
<div <div
class="tab-pane fade" class="tab-pane fade"
v-bind:class="{ 'show active': settings.radiocontrol === 'disabled' }" v-bind:class="{ 'show active': settings.remote.RADIO.control === 'disabled' }"
id="list-rig-control-none" id="list-rig-control-none"
role="tabpanel" role="tabpanel"
aria-labelledby="list-rig-control-none-list" aria-labelledby="list-rig-control-none-list"
@ -145,7 +145,7 @@ alert("not yet implemented")
<div <div
class="tab-pane fade" class="tab-pane fade"
id="list-rig-control-rigctld" id="list-rig-control-rigctld"
v-bind:class="{ 'show active': settings.radiocontrol === 'rigctld' }" v-bind:class="{ 'show active': settings.remote.RADIO.control === 'rigctld' }"
role="tabpanel" role="tabpanel"
aria-labelledby="list-rig-control-rigctld-list" aria-labelledby="list-rig-control-rigctld-list"
> >
@ -200,7 +200,7 @@ alert("not yet implemented")
<div <div
class="tab-pane fade" class="tab-pane fade"
id="list-rig-control-tci" id="list-rig-control-tci"
v-bind:class="{ 'show active': settings.radiocontrol === 'tci' }" v-bind:class="{ 'show active': settings.remote.RADIO.control === 'tci' }"
role="tabpanel" role="tabpanel"
aria-labelledby="list-rig-control-tci-list" aria-labelledby="list-rig-control-tci-list"
> >
@ -214,7 +214,7 @@ alert("not yet implemented")
placeholder="tci IP" placeholder="tci IP"
id="tci_ip" id="tci_ip"
aria-label="Device IP" aria-label="Device IP"
v-model="settings.tci_ip" v-model="settings.remote.TCI.tci_ip"
/> />
</div> </div>
@ -226,7 +226,7 @@ alert("not yet implemented")
placeholder="tci port" placeholder="tci port"
id="tci_port" id="tci_port"
aria-label="Device Port" aria-label="Device Port"
v-model="settings.tci_port" v-model="settings.remote.TCI.tci_port"
/> />
</div> </div>
</div> </div>

View file

@ -176,20 +176,7 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
<option value="3600">60 mins</option> <option value="3600">60 mins</option>
</select> </select>
</div> </div>
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Enable waterfall data</label>
<label class="input-group-text w-50">
<div class="form-check form-switch form-check-inline">
<input
class="form-check-input"
type="checkbox"
id="fftSwitch"
v-model="settings.local.enable_fft"
/>
<label class="form-check-label" for="fftSwitch">Waterfall</label>
</div>
</label>
</div>
<div class="input-group input-group-sm mb-1"> <div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Enable 250Hz bandwidth mode</label> <label class="input-group-text w-50">Enable 250Hz bandwidth mode</label>
<label class="input-group-text w-50"> <label class="input-group-text w-50">

View file

@ -896,7 +896,7 @@ export function newMessageReceived(message, protocol) {
uuid: message[3], uuid: message[3],
duration: 0, duration: 0,
nacks: 0, nacks: 0,
speed_list: [], speed_list: "[]",
_attachments: { _attachments: {
[message[6]]: { [message[6]]: {
content_type: message[7], content_type: message[7],

View file

@ -8,9 +8,6 @@ setActivePinia(pinia);
import { settingsStore as settings, onChange } from "../store/settingsStore.js"; import { settingsStore as settings, onChange } from "../store/settingsStore.js";
import { useAudioStore } from "../store/audioStore.js";
const audioStore = useAudioStore(pinia);
import { useStateStore } from "../store/stateStore"; import { useStateStore } from "../store/stateStore";
const stateStore = useStateStore(pinia); const stateStore = useStateStore(pinia);
@ -89,11 +86,11 @@ export function loadSettings() {
} }
try { try {
if (key == "wftheme") { if (key == "wftheme") {
setColormap(config[key]); setColormap();
} }
if (key == "mycall") { if (key == "mycall") {
settings.mycall = config[key].split("-")[0]; settings.remote.STATION.mycall = config[key].split("-")[0];
settings.myssid = config[key].split("-")[1]; settings.remote.STATION.myssid = config[key].split("-")[1];
} else { } else {
settings[key] = config[key]; settings[key] = config[key];
} }
@ -127,11 +124,11 @@ export function processModemConfig(data) {
let mycall = data[category][setting]; let mycall = data[category][setting];
if (mycall.includes("-")) { if (mycall.includes("-")) {
const splittedCallsign = mycall.split("-"); const splittedCallsign = mycall.split("-");
settings.mycall = splittedCallsign[0]; // The part before the hyphen settings.remote.STATION.mycall = splittedCallsign[0]; // The part before the hyphen
settings.myssid = parseInt(splittedCallsign[1], 10); // The part after the hyphen, converted to a number settings.remote.STATION.myssid = parseInt(splittedCallsign[1], 10); // The part after the hyphen, converted to a number
} else { } else {
settings.mycall = mycall; // Use the original mycall if no SSID is present settings.remote.STATION.mycall = mycall; // Use the original mycall if no SSID is present
settings.myssid = 0; // Default SSID if not provided settings.remote.STATION.myssid = 0; // Default SSID if not provided
} }
} else { } else {
settings[variableName] = data[category][setting]; settings[variableName] = data[category][setting];