From c7f5ec2f6c5782a45cb414fb7ee624175ec7979d Mon Sep 17 00:00:00 2001
From: Gaston Gonzalez <info@thetechprepper.com>
Date: Mon, 17 Mar 2025 11:34:33 -0700
Subject: [PATCH] Fixes - Post R4 Build 15 fixes

---
 overlay/opt/emcomm-tools/bin/et-radio  | 12 +++---------
 overlay/opt/emcomm-tools/bin/et-uv-pro |  5 ++---
 overlay/opt/emcomm-tools/bin/et-vr-n76 |  6 +++---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-radio b/overlay/opt/emcomm-tools/bin/et-radio
index f93119b..e049fcf 100755
--- a/overlay/opt/emcomm-tools/bin/et-radio
+++ b/overlay/opt/emcomm-tools/bin/et-radio
@@ -2,19 +2,14 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 11 October 2024
-# Updated  : 5 February 2025
+# Updated  : 16 March 2025
 # Purpose  : A script for managaing plug-and-play radios
-set -e
+source /opt/emcomm-tools/bin/et-common
 
 ACTIVE_RADIO="${ET_HOME}/conf/radios.d/active-radio.json"
 
 NO_RADIO_ID="no-radio"
 
-YELLOW="\033[1;33m"
-GREEN="\033[0;32m"
-RED="\033[0;31m"
-NC="\033[0m"
-
 options=()
 options+=("${NO_RADIO_ID}" "No radio")
 while IFS= read -r radio; do
@@ -51,8 +46,7 @@ if [ $exit_status -eq 0 ]; then
   BLUETOOTH_TNC_CHECK=$(ps -ef | grep "[r]fcomm connect")
   if [[ $? -eq 0 ]]; then
     et-log "Killing running processes for Bluetooth TNC"
-    sudo /usr/bin/killall kissattach
-    sudo /usr/bin/killall rfcomm
+    sudo /opt/emcomm-tools/bin/et-kill-bt
   fi
 
   printf "%-20s %-10s %-10s\n" "Radio ID" "Vendor" "Model"
diff --git a/overlay/opt/emcomm-tools/bin/et-uv-pro b/overlay/opt/emcomm-tools/bin/et-uv-pro
index 57007df..0e24bf6 100755
--- a/overlay/opt/emcomm-tools/bin/et-uv-pro
+++ b/overlay/opt/emcomm-tools/bin/et-uv-pro
@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 1 January 2025
-# Updated  : 16 March 2025
+# Updated  : 17 March 2025
 # Purpose  : Utility for accessing the Bluetooth TNC on the BTECH UV PRO.           
 source /opt/emcomm-tools/bin/et-common
 
@@ -236,8 +236,7 @@ EOF
 
     is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
     if [ "${is_paired}" != "yes" ]; then
-    echo -e "${RED}"
-      et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
+      echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'"
       echo -e "${NC}"
       exit 1
     fi  
diff --git a/overlay/opt/emcomm-tools/bin/et-vr-n76 b/overlay/opt/emcomm-tools/bin/et-vr-n76
index 90b6bd8..429462c 100755
--- a/overlay/opt/emcomm-tools/bin/et-vr-n76
+++ b/overlay/opt/emcomm-tools/bin/et-vr-n76
@@ -1,8 +1,9 @@
 #!/bin/bash
 #
 # Author   : Gaston Gonzalez
+#          : Cliff Jones
 # Date     : 1 January 2025
-# Updated  : 16 March 2025
+# Updated  : 17 March 2025
 # Purpose  : Utility for accessing the Bluetooth TNC on the BTECH UV PRO.           
 source /opt/emcomm-tools/bin/et-common
 
@@ -236,8 +237,7 @@ EOF
 
     is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
     if [ "${is_paired}" != "yes" ]; then
-    echo -e "${RED}"
-      et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
+      echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'"
       echo -e "${NC}"
       exit 1
     fi