[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 62066d5b74e8ef909aeb37093446f757160454d0

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  62066d5b74e8ef909aeb37093446f757160454d0 (commit)
       via  9e8b7539bbc0f822fcd7e8bc0f7e77a12e37378f (commit)
       via  eefea70a248f4de283037c5878f080f0b370492e (commit)
      from  a15353ec4c4c2989bed303b51c21235762955ba6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 62066d5b74e8ef909aeb37093446f757160454d0
Merge: a15353ec 9e8b7539
Author: Michael Black <mdb...@ya...>
Date:   Fri Jan 8 06:37:25 2021 -0600

    Merge pull request #495 from mikaelnousiainen/yaesu-ft2000-fix-vfob-for-sh-an
    
    Fix SH and AN commands on FT-2000 for VFOB as these commands are not targetable


commit 9e8b7539bbc0f822fcd7e8bc0f7e77a12e37378f
Author: Mikael Nousiainen <mik...@ik...>
Date:   Fri Jan 8 09:13:56 2021 +0200

    Set FT-2000 retries to 3 to follow other Yaesu backends. There should be no need for 10 retries.

diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c
index aeaa6af1..c4428cf0 100644
--- a/rigs/yaesu/ft2000.c
+++ b/rigs/yaesu/ft2000.c
@@ -107,7 +107,7 @@ const struct rig_caps ft2000_caps =
     .write_delay =        FT2000_WRITE_DELAY,
     .post_write_delay =   FT2000_POST_WRITE_DELAY,
     .timeout =            2000,
-    .retry =              10,
+    .retry =              3,
     .has_get_func =       FT2000_FUNCS,
     .has_set_func =       FT2000_FUNCS,
     .has_get_level =      FT2000_LEVELS,

commit eefea70a248f4de283037c5878f080f0b370492e
Author: Mikael Nousiainen <mik...@ik...>
Date:   Fri Jan 8 09:12:29 2021 +0200

    Fix SH and AN commands on FT-2000 for VFOB as these commands are not targetable

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 76f94cdc..f5a03ea1 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -3010,7 +3010,7 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
         return err;
     }
 
-    if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+    if ((rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) && !is_ft2000)
     {
         main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }
@@ -3102,7 +3102,7 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
         return err;
     }
 
-    if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+    if ((rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) && !is_ft2000)
     {
         main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }
@@ -7465,6 +7465,10 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on,
                  w);
     }
+    else if (is_ft2000)
+    {
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH0%02d;", w);
+    }
     else
     {
         snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%02d;", main_sub_vfo, w);
@@ -7690,8 +7694,15 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
 
     if (sh_command_valid)
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", cmd, main_sub_vfo,
-                 cat_term);
+        if (is_ft2000)
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s0%c", cmd, cat_term);
+        }
+        else
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", cmd, main_sub_vfo,
+                    cat_term);
+        }
 
         err = newcat_get_cmd(rig);
 

-----------------------------------------------------------------------

Summary of changes:
 rigs/yaesu/ft2000.c |  2 +-
 rigs/yaesu/newcat.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries