From e38b1469a280edfa0be63660e167b6457386054a Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Wed, 3 Mar 2021 15:57:12 -0600
Subject: [PATCH] Update elecraft rig detection
 https://github.com/Hamlib/Hamlib/issues/563Z

---
 rigs/kenwood/elecraft.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/rigs/kenwood/elecraft.c b/rigs/kenwood/elecraft.c
index 70a79077e..bce1e3068 100644
--- a/rigs/kenwood/elecraft.c
+++ b/rigs/kenwood/elecraft.c
@@ -196,20 +196,27 @@ int elecraft_open(RIG *rig)
         if (strstr(buf, "P")) { priv->has_kpa3 = 1; }
 
         // could also use K4; command
-        if (rig->caps->rig_model == RIG_MODEL_K4) { priv->is_k4 = 1; }
-        else if (strstr(buf, "R")) { priv->is_k3s = 1; }
-        else if (strncmp(&buf[13], "--", 2) == 0) { priv->is_k3 = 1; }
+        priv->is_k3 = 1;  // default to K3
 
+        if (rig->caps->rig_model == RIG_MODEL_K4) { 
+            priv->is_k3 = 0; 
+            priv->is_k4 = 1;
+        }
+        else if (strstr(buf, "R")) 
+        {
+            priv->is_k3 = 0; 
+            priv->is_k3s = 1;
+        }
         // combination of OM flags determines model
         if (strstr(buf, "S") && strstr(buf, "4") && strstr(buf, "H"))
         {
             // new firmware should recognize k4hd now
-            priv->is_k4 = 0;
+            priv->is_k3 = 0;
             priv->is_k4hd = 1;
         }
-        else if (strstr(buf,"S") && strstr(buf,"4"))
+        else if (strstr(buf, "S") && strstr(buf, "4"))
         {
-            priv->is_k4 = 0;
+            priv->is_k3 = 0;
             priv->is_k4d = 1;
         }