From 3254ac70a1583f04b6b165a8d526e930a97c4d93 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Mon, 20 Mar 2023 23:10:35 -0500
Subject: [PATCH] Change FT991, FTDX101MP, FTDX3000 to use ; for command
 validation https://github.com/Hamlib/Hamlib/issues/1252

---
 rigs/yaesu/newcat.c | 15 +++++++++++++++
 rigs/yaesu/newcat.h |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 939b05e04..3247d8cb5 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -10844,6 +10844,21 @@ int newcat_set_cmd_validate(RIG *rig)
 
         if (strlen(valcmd) == 0) { RETURNFUNC(RIG_OK); }
 
+        // we can use a single ; to get a reponse of ?; for some rigs
+        // this list can be expanded as we get more testing
+        // seems newer rigs have this older ones time out
+        switch(rig->caps->rig_model)
+        {
+            case RIG_MODEL_FT991:
+            case RIG_MODEL_FTDX101MP:
+            case RIG_MODEL_FTDX3000:
+                strcpy(valcmd, "");
+            // these models do not work with a single ;
+            case RIG_MODEL_FT897:
+            default:
+                // no change to validation command
+        }
+
         SNPRINTF(cmd, sizeof(cmd), "%s", valcmd);
         rc = write_block(&state->rigport, (unsigned char *) cmd, strlen(cmd));
 
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 1844e9c92..0b34562c4 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20230228"
+#define NEWCAT_VER "20230320"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129