From fc8642fbf85bb3d866f9dfb9b139c9e7b0611f80 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Sat, 13 Jul 2024 16:31:26 -0500
Subject: [PATCH] Fix elecraft TQ command processing. Had put in an exception
 for Hilberling which affected Elecraft TQ command too So have made Hilberling
 exception very specific https://github.com/Hamlib/Hamlib/issues/1583

---
 rigs/kenwood/elecraft.c | 6 ------
 rigs/kenwood/kenwood.c  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/rigs/kenwood/elecraft.c b/rigs/kenwood/elecraft.c
index 7cac883ef..03fba1140 100644
--- a/rigs/kenwood/elecraft.c
+++ b/rigs/kenwood/elecraft.c
@@ -640,12 +640,6 @@ int elecraft_get_vfo_tq(RIG *rig, vfo_t *vfo)
         SNPRINTF(cmdbuf, sizeof(cmdbuf), "TQ;");
     }
     retval = kenwood_safe_transaction(rig, cmdbuf, splitbuf, 12, 3);
-    if (rig->caps->rig_model == RIG_MODEL_K4 && RIGPORT(rig)->type.rig == RIG_PORT_NETWORK && strncmp(cmdbuf, "TQ", 2) == 0)
-    {
-        // special exception in case K4 is using TCP/IP
-        // seems to be slow on the TQ/TQX commands taking some 350ms
-        hl_usleep(250*1000);
-    }
 
     if (retval != RIG_OK)
     {
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index be3302a2c..80216f4d1 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -378,7 +378,7 @@ transaction_write:
         skip |= strncmp(cmdstr, "PS1", 3) == 0;
         skip |= strncmp(cmdstr, "PS0", 3) == 0;
         skip |= strncmp(cmdstr, "K22", 3) == 0;
-        skip |= strncmp(cmdstr, "TQ", 2) == 0; // Skip Hilberling TQ command check
+        skip |= (rig->caps->rig_model == RIG_MODEL_PT8000A && (strlen(cmdstr) > 3) && (strncmp(cmdstr, "TQ", 2) == 0)); // Skip Hilberling TQn command check
 
         if (skip)
         {