From 539df1624d51dd3c73261ae6e2543e3d1d4af5e9 Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Fri, 28 Feb 2020 17:02:12 -0600
Subject: [PATCH] Trying to get IC9700 split working with WSJTX Changed
 get_split_vfos to recognize priv->split_on

---
 rigs/icom/icom.c | 19 ++++++++++++-------
 rigs/icom/icom.h |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 59ad15978..ac36a8ee2 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -3367,13 +3367,18 @@ int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
     }
     else if (VFO_HAS_MAIN_SUB_A_B_ONLY)
     {
-        // TBD -- newer rigs we need to find active VFO
-        // priv->curvfo if VFOA then A/B response else priv->curvfo=Main Main/Sub response
-        // For now we return Main/Sub
-        *rx_vfo = priv->rx_vfo = RIG_VFO_MAIN;
-        *tx_vfo = priv->tx_vfo = RIG_VFO_SUB;
-        rig_debug(RIG_DEBUG_TRACE, "%s: VFO_HAS_MAIN_SUB_A_B_ONLY, rx=%s, tx=%s\n",
-                  __func__, rig_strvfo(*rx_vfo), rig_strvfo(*tx_vfo));
+        // e.g. IC9700 split on Main/Sub does not work
+        // only Main VFOA/B and SubRx/MainTx split works
+        if (priv->split_on) {
+            *rx_vfo = priv->rx_vfo = RIG_VFO_A;
+            *tx_vfo = priv->tx_vfo = RIG_VFO_B;
+        }
+        else {
+            *rx_vfo = priv->rx_vfo = RIG_VFO_SUB;
+            *tx_vfo = priv->tx_vfo = RIG_VFO_MAIN;
+        }
+        rig_debug(RIG_DEBUG_TRACE, "%s: VFO_HAS_MAIN_SUB_A_B_ONLY, split=%d, rx=%s, tx=%s\n",
+                  __func__, priv->split_on, rig_strvfo(*rx_vfo), rig_strvfo(*tx_vfo));
     }
     else
     {
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 434564b5a..f9f86154e 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "0.31"
+#define BACKEND_VER "0.31a"
 
 /*
  * defines used by comp_cal_str in rig.c