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] 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 ||