From 824a6d11fc37fb2877ab5bbe487d911c7ae56b45 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 16 Aug 2022 09:29:07 -0500
Subject: [PATCH] Turn off 60M split for Yaesu rigs (e.g. FTDX-10) that have to
 use memory mode for 60M band

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

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 6a35a6659..54b6e98c8 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -771,7 +771,16 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     ENTERFUNC;
 
-    if (newcat_60m_exception(rig, freq)) { RETURNFUNC(RIG_OK); } // we don't set freq in this case
+    if (newcat_60m_exception(rig, freq)) 
+    { 
+        // we don't try to set freq on 60m for some rigs since we must be in memory mode
+        // and we can't run split mode on 60M memory mode either
+        if (rig->state.cache.split == RIG_SPLIT_ON)
+        {
+            rig_set_split_vfo(rig, RIG_VFO_A, RIG_VFO_A, RIG_SPLIT_OFF);
+        }
+        RETURNFUNC(RIG_OK);
+    } // we don't set freq in this case
 
     if (!newcat_valid_command(rig, "FA"))
     {
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index ebe4db525..61c5cfd08 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20220730"
+#define NEWCAT_VER "20220816"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129