Revert "Change rig_set_split_mode to use TOGGLE first, then set_vfo"

This reverts commit c1c549cbf3.

rigs/yaesu/newcat.c

@@ -1242,10 +1242,15 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     {
         priv->cmd_str[2] = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }
+    else // since we don't have targetable mode we will swap VFOS, set, and swap back
+    { // this should avoid some rig flashing 
+        sprintf(priv->cmd_str,"AB;MD0%c;AB;", newcat_modechar(mode));
+    }
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: generic mode = %s \n",
               __func__, rig_strrmode(mode));
 
+
     err = newcat_set_cmd(rig);
 
     if (err != RIG_OK)

src/rig.c

@@ -4273,16 +4273,15 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
     }
 
 
-    // prefer the vfo swap method to reduce rig display flashing
+    if (caps->set_vfo)
-    if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op)
-    {
-        retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
-    }
-    else if (caps->set_vfo)
     {
         TRACE;
         retcode = caps->set_vfo(rig, tx_vfo);
     }
+    else if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op)
+    {
+        retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
+    }
     else
     {
         rig_debug(RIG_DEBUG_WARN,