mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e47b644bf9
|
@ -392,7 +392,8 @@ function saveGridLayout()
|
|||
var widget = gridWidgets.findIndex((gw) => gw.component2.__name == items.value[i].component2.__name)
|
||||
//Get the widget's id to store in config
|
||||
var widgetid = gridWidgets[widget].id;
|
||||
console.log(widgetid + "-" + widget);
|
||||
//Debug code to return index of widget based on id
|
||||
//console.log(widgetid + "-" + widget);
|
||||
cfg[i] = [items.value[i].x, items.value[i].y, items.value[i].w,items.value[i].h, widgetid ];
|
||||
}
|
||||
settingsStore.local.grid_layout=JSON.stringify(cfg);
|
||||
|
|
|
@ -94,7 +94,41 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
|
|||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Audio rx level-->
|
||||
<div class="input-group input-group-sm mb-1">
|
||||
<span class="input-group-text w-25">RX Audio Level</span>
|
||||
<span class="input-group-text w-25">{{
|
||||
settings.remote.AUDIO.rx_audio_level
|
||||
}}</span>
|
||||
<span class="input-group-text w-50">
|
||||
<input
|
||||
type="range"
|
||||
class="form-range"
|
||||
min="-30"
|
||||
max="20"
|
||||
step="1"
|
||||
id="audioLevelRX"
|
||||
@change="onChange"
|
||||
v-model.number="settings.remote.AUDIO.rx_audio_level"
|
||||
/></span>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-1">
|
||||
<span class="input-group-text w-25">TX Audio Level</span>
|
||||
<span class="input-group-text w-25">{{
|
||||
settings.remote.AUDIO.tx_audio_level
|
||||
}}</span>
|
||||
<span class="input-group-text w-50">
|
||||
<input
|
||||
type="range"
|
||||
class="form-range"
|
||||
min="-30"
|
||||
max="20"
|
||||
step="1"
|
||||
id="audioLevelTX"
|
||||
@change="onChange"
|
||||
v-model.number="settings.remote.AUDIO.tx_audio_level"
|
||||
/></span>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-1">
|
||||
<label class="input-group-text w-50">TX delay in ms</label>
|
||||
<select
|
||||
|
|
|
@ -1,5 +1,20 @@
|
|||
<script setup lang="ts">
|
||||
import { settingsStore as settings, onChange } from "../store/settingsStore.js";
|
||||
import {
|
||||
settingsStore as settings,
|
||||
onChange,
|
||||
getRemote,
|
||||
} from "../store/settingsStore.js";
|
||||
import {
|
||||
validateCallsignWithSSID,
|
||||
validateCallsignWithoutSSID,
|
||||
} from "../js/freedata";
|
||||
function validateCall() {
|
||||
if (validateCallsignWithoutSSID(settings.remote.STATION.mycall))
|
||||
//Send new callsign to modem if valid
|
||||
onChange();
|
||||
//Reload settings from modem as invalid callsign was passed in
|
||||
else getRemote();
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<!-- station callsign -->
|
||||
|
@ -14,8 +29,8 @@ import { settingsStore as settings, onChange } from "../store/settingsStore.js";
|
|||
id="myCall"
|
||||
aria-label="Station Callsign"
|
||||
aria-describedby="basic-addon1"
|
||||
@change="onChange"
|
||||
v-model="settings.remote.STATION.mycall"
|
||||
@change="validateCall"
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ export function sortByPropertyDesc(property) {
|
|||
* @returns true or false if callsign appears to be valid with an SSID
|
||||
*/
|
||||
export function validateCallsignWithSSID(callsign: string) {
|
||||
var patt = new RegExp("^[A-Z,a-z]+[0-9][A-Z,a-z]*-(1[0-5]|[0-9])$");
|
||||
var patt = new RegExp("^[A-Z]+[0-9][A-Z]*-(1[0-5]|[0-9])$");
|
||||
|
||||
if (
|
||||
callsign === undefined ||
|
||||
|
@ -82,7 +82,7 @@ export function validateCallsignWithSSID(callsign: string) {
|
|||
* @returns true or false if callsign appears to be valid without an SSID
|
||||
*/
|
||||
export function validateCallsignWithoutSSID(callsign: string) {
|
||||
var patt = new RegExp("^[A-Za-z]+[0-9][A-Za-z]+$");
|
||||
var patt = new RegExp("^[A-Z]+[0-9][A-Z]+$");
|
||||
|
||||
if (
|
||||
callsign === undefined ||
|
||||
|
|
Loading…
Reference in a new issue