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

rigs/icom/icom.c

@@ -1061,35 +1061,6 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
     rs = &rig->state;
     priv = (struct icom_priv_data *) rs->priv;
 
-    if (rig->caps->rig_model == RIG_MODEL_IC910
-            || rig->caps->rig_model == RIG_MODEL_FTDX101D)
-    {
-        ptt_t ptt;
-        retval = rig_get_ptt(rig, RIG_VFO_CURR, &ptt);
-
-        if (retval != RIG_OK)
-        {
-            return retval;
-        }
-
-        if (ptt)
-        {
-            rig_debug(RIG_DEBUG_TRACE, "%s: split is on so returning last known freq\n",
-                      __func__);
-            *freq = priv->vfoa_freq;
-            return RIG_OK;
-        }
-    }
-
-#if 0 // disabled to test if IC9700 satmode/gpredict still works OK
-
-    if (priv->curr_vfo == RIG_VFO_NONE)
-    {
-        icom_set_default_vfo(rig);
-    }
-
-#endif
-
     cmd = C_RD_FREQ;
     subcmd = -1;
 

rigs/yaesu/ft991.c

@@ -711,9 +711,7 @@ static int ft991_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 static int ft991_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 {
     struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
-    int i;
     int err;
-    ncboolean tone_match;
     rmode_t rmode;
 
     rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
@@ -736,6 +734,8 @@ static int ft991_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
     }
     else
     {
+        int i;
+        ncboolean tone_match;
         for (i = 0, tone_match = FALSE; rig->caps->ctcss_list[i] != 0; i++)
         {
             if (tone == rig->caps->ctcss_list[i])

rigs/yaesu/newcat.c

@@ -4724,6 +4724,7 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo)
     struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
     int err;
     char p1;
+    char *command = "FT";
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
@@ -4780,7 +4781,13 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo)
         p1 = p1 + 2;    /* use non-Toggle commands */
     }
 
-    snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", "FT", p1, cat_term);
+    if (is_ft101)
+    {
+        // what other Yaeus rigs should be using this?
+        // The DX101D returns FT0 when in split and not transmitting
+        command = "ST";
+    }
+    snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", command, p1, cat_term);
 
     rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);
 
@@ -4800,7 +4807,7 @@ int newcat_get_tx_vfo(RIG *rig, vfo_t *tx_vfo)
     vfo_t vfo_mode;
     char const *command = "FT";
 
-    if (rig->caps->rig_model == RIG_MODEL_FTDX101D)
+    if (is_ft101)
     {
         // what other Yaeus rigs should be using this?
         // The DX101D returns FT0 when in split and not transmitting

rigs/yaesu/newcat.h

@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20200610"
+#define NEWCAT_VER "20200611"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129

rotators/gs232a/gs232b.c

@@ -143,7 +143,7 @@ transaction_write:
     // If asked for we will check for connection
     // we don't expect a reply...just a prompt return
     // Seems some GS232B's only echo the CR
-    if (no_reply && (strncmp(data, "?>", 2) != 0) && data[0] != 0x0d)
+    if ((strncmp(data, "?>", 2) != 0) && data[0] != 0x0d)
     {
         rig_debug(RIG_DEBUG_VERBOSE,
                   "%s: Expected '?>' but got '%s' from cmd '%s'\n",

src/rig.c

@@ -2011,15 +2011,11 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     // we only get the freq if we set the vfo OK
     if (retcode == RIG_OK && caps->get_freq)
     {
-        if (caps->get_freq)
-        {
-            retcode = caps->get_freq(rig, vfo, &curr_freq);
-            rig_debug(RIG_DEBUG_TRACE, "%s: retcode from rig_get_freq = %s\n", __func__,
-                      rigerror(retcode));
-        }
+        retcode = caps->get_freq(rig, vfo, &curr_freq);
+        rig_debug(RIG_DEBUG_TRACE, "%s: retcode from rig_get_freq = %s\n", __func__,
+                  rigerror(retcode));
     }
 
-
     // expire several cached items when we switch VFOs
     elapsed_ms(&rig->state.cache.time_vfo, ELAPSED_INVALIDATE);
     elapsed_ms(&rig->state.cache.time_freq, ELAPSED_INVALIDATE);