Merge branch 'master' of https://github.com/mdblack98/Hamlib

rigs/kenwood/kenwood.c

@@ -1375,6 +1375,7 @@ int kenwood_get_vfo_if(RIG *rig, vfo_t *vfo)
     {
     case '0':
         *vfo = priv->tx_vfo = split_and_transmitting ? RIG_VFO_B : RIG_VFO_A;
+        if (priv->info[32] == '1') priv->tx_vfo = RIG_VFO_B;
         break;
 
     case '1':

rigs/kenwood/kenwood.h

@@ -27,7 +27,7 @@
 #include <string.h>
 #include "token.h"
 
-#define BACKEND_VER "20200528"
+#define BACKEND_VER "20200601"
 
 #define EOM_KEN ';'
 #define EOM_TH '\r'

tests/rigctlcom.c

@@ -704,6 +704,7 @@ static int write_block2(void *func,
  */
 static int handle_ts2000(void *arg)
 {
+    rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, (char*)arg);
     // Handle all the queries
     if (strcmp(arg, "ID;") == 0)
     {
@@ -752,15 +753,16 @@ static int handle_ts2000(void *arg)
             return retval;
         }
 
-        if (ptt)
+        // we need to know split status -- don't care about the vfo
+        retval = rig_get_split_vfo(my_rig, RIG_VFO_CURR, &split, &vfo);
+
+        if (retval != RIG_OK)
         {
-            retval = rig_get_split_vfo(my_rig, RIG_VFO_CURR, &split, &vfo);
-        }
-        else
-        {
-            retval = rig_get_vfo(my_rig, &vfo);
+            return retval;
         }
 
+        retval = rig_get_vfo(my_rig, &vfo);
+
         if (retval != RIG_OK)
         {
             return retval;