From 1284ff18255f4e7e793b106aa886380b11d86211 Mon Sep 17 00:00:00 2001
From: David Stewart <dstewartgo@gmail.com>
Date: Thu, 11 Dec 2025 16:40:54 -0800
Subject: [PATCH 1/3] Update uv-pro, vr-n76, and th-d74

When the jq (json query) command executes, it returns 0 if there is a .bluetooth.mac node in the json (which there is, and should be). This means we can't use $? to see if there is a value in the node or not. We need to check the value directly.

Verified that this fixes my pairing issues with the BTech UV-Pro. I'm guessing similar issues exist for the other brands of the same radio, but I don't have those to check against.
---
 overlay/opt/emcomm-tools/bin/et-uv-pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-uv-pro b/overlay/opt/emcomm-tools/bin/et-uv-pro
index 0e24bf6..db15245 100755
--- a/overlay/opt/emcomm-tools/bin/et-uv-pro
+++ b/overlay/opt/emcomm-tools/bin/et-uv-pro
@@ -147,7 +147,7 @@ case $1 in
   p|pair)
 
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
-    if [ $? -eq 0 ]; then
+    if [[ "{$MAC}" != "" ]]; then
       PAIR_STATUS=$(bluetoothctl info "${MAC}" | grep "Paired:" | awk '{print $2}')
       if [ "${PAIR_STATUS}" == "yes" ]; then
          echo "Device with MAC ${MAC} is already paired."

From a480bf3f7a7e26eb48358878f45751431030a42c Mon Sep 17 00:00:00 2001
From: David Stewart <dstewartgo@gmail.com>
Date: Thu, 11 Dec 2025 16:43:02 -0800
Subject: [PATCH 2/3] Update et-vr-n76

---
 overlay/opt/emcomm-tools/bin/et-vr-n76 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-vr-n76 b/overlay/opt/emcomm-tools/bin/et-vr-n76
index cd9748b..7d37c3f 100755
--- a/overlay/opt/emcomm-tools/bin/et-vr-n76
+++ b/overlay/opt/emcomm-tools/bin/et-vr-n76
@@ -148,7 +148,7 @@ case $1 in
   p|pair)
 
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
-    if [ $? -eq 0 ]; then
+    if [[ "{$MAC}" != "" ]]; then
       PAIR_STATUS=$(bluetoothctl info "${MAC}" | grep "Paired:" | awk '{print $2}')
       if [ "${PAIR_STATUS}" == "yes" ]; then
          echo "Device with MAC ${MAC} is already paired."

From bbcf207420e99a211407c378a679bca62e027cb6 Mon Sep 17 00:00:00 2001
From: David Stewart <dstewartgo@gmail.com>
Date: Thu, 11 Dec 2025 16:43:20 -0800
Subject: [PATCH 3/3] Update et-th-d74

---
 overlay/opt/emcomm-tools/bin/et-th-d74 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-th-d74 b/overlay/opt/emcomm-tools/bin/et-th-d74
index 034db0c..d868d9f 100755
--- a/overlay/opt/emcomm-tools/bin/et-th-d74
+++ b/overlay/opt/emcomm-tools/bin/et-th-d74
@@ -148,7 +148,7 @@ case $1 in
   p|pair)
 
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
-    if [ $? -eq 0 ]; then
+    if [[ "{$MAC}" != "" ]]; then
       PAIR_STATUS=$(bluetoothctl info "${MAC}" | grep "Paired:" | awk '{print $2}')
       if [ "${PAIR_STATUS}" == "yes" ]; then
          echo "Device with MAC ${MAC} is already paired."