From f43aa43671979a44a374634b66f3092763373e4a Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 16 May 2023 15:57:22 -0500
Subject: [PATCH] Fix newcat.c VFOB validation

---
 rigs/yaesu/newcat.c | 3 ++-
 rigs/yaesu/newcat.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index c36e45f2d..49319aad8 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -10889,7 +10889,7 @@ int newcat_set_cmd_validate(RIG *rig)
 
         // FA and FB success is now verified in rig.c with a followup query
         // so no validation is needed
-        if (strncmp(priv->cmd_str, "FA", 2) == 0 || strncmp(priv->cmd_str, "FB", 2))
+        if (strncmp(priv->cmd_str, "FA", 2) == 0 || strncmp(priv->cmd_str, "FB", 2) == 0)
         {
             return RIG_OK;
         }
@@ -10919,6 +10919,7 @@ int newcat_set_cmd_validate(RIG *rig)
             if (strncmp(priv->cmd_str, "VS", 2) == 0
                     && strncmp(priv->cmd_str, priv->ret_data, 2) == 0) { RETURNFUNC(RIG_OK); }
             else if (strcmp(priv->cmd_str, priv->ret_data) == 0) { RETURNFUNC(RIG_OK); }
+            else if (priv->cmd_str[0] == ';' && priv->ret_data[0]=='?') { RETURNFUNC(RIG_OK); }
             else { rc = -RIG_EPROTO; }
         }
 
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 35b49b9fc..ef6fc4296 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20230513"
+#define NEWCAT_VER "20230516"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129