From f67f62f3adc0ffe646044da408737956ef8cdf6f Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 13 Jan 2024 13:08:12 -0500
Subject: [PATCH 1/5] Validate call sign before sending to modem.

---
 gui/src/components/settings_station.vue | 17 +++++++++++++++--
 gui/src/js/freedata.ts                  |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
index c4fce14c..c3ad9168 100644
--- a/gui/src/components/settings_station.vue
+++ b/gui/src/components/settings_station.vue
@@ -1,5 +1,17 @@
 <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();
+  else
+    //Reload settings from modem as invalid callsign was passed in
+    getRemote();
+
+}
+
 </script>
 <template>
   <!-- station callsign -->
@@ -14,8 +26,9 @@ 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>
 
diff --git a/gui/src/js/freedata.ts b/gui/src/js/freedata.ts
index 18e31f1a..8e8ffd10 100644
--- a/gui/src/js/freedata.ts
+++ b/gui/src/js/freedata.ts
@@ -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 ||

From 7d79a3b74b1859103a6831dadfcfb4b66d3132cb Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Sat, 13 Jan 2024 18:08:54 +0000
Subject: [PATCH 2/5] [CodeFactor] Apply fixes

---
 gui/src/components/settings_station.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
index c3ad9168..9d35a3a0 100644
--- a/gui/src/components/settings_station.vue
+++ b/gui/src/components/settings_station.vue
@@ -1,17 +1,20 @@
 <script setup lang="ts">
-import { settingsStore as settings, onChange, getRemote } from "../store/settingsStore.js";
-import {validateCallsignWithSSID, validateCallsignWithoutSSID} from "../js/freedata";
-function validateCall()
-{
+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();
-  else
-    //Reload settings from modem as invalid callsign was passed in
-    getRemote();
-
+  //Reload settings from modem as invalid callsign was passed in
+  else getRemote();
 }
-
 </script>
 <template>
   <!-- station callsign -->
@@ -28,7 +31,6 @@ function validateCall()
       aria-describedby="basic-addon1"
       v-model="settings.remote.STATION.mycall"
       @change="validateCall"
-  
     />
   </div>
 

From fe01b064c3e90ef3f3411e919c9b2c93ebc6b839 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 13 Jan 2024 13:19:22 -0500
Subject: [PATCH 3/5] Add audio level settings to settings

---
 gui/src/components/settings_modem.vue | 36 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index 744a3ddb..37a74b83 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -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

From 3c353f51e37ac478aa7402ae040ae828d0e2d7c8 Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Sat, 13 Jan 2024 18:19:50 +0000
Subject: [PATCH 4/5] [CodeFactor] Apply fixes to commit fe01b06

---
 gui/src/components/settings_modem.vue | 66 +++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index 37a74b83..ba4d4beb 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -96,39 +96,39 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
   </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>
+    <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

From de42481e2453a04f28771996bac8796d98237447 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 13 Jan 2024 13:58:54 -0500
Subject: [PATCH 5/5] Remove some debug logging

---
 gui/src/components/dynamic_components.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/src/components/dynamic_components.vue b/gui/src/components/dynamic_components.vue
index f3920bd1..5fa55898 100644
--- a/gui/src/components/dynamic_components.vue
+++ b/gui/src/components/dynamic_components.vue
@@ -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);