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

[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  eb952ad75fb9815781f3bf5ef53765eebc4607ff (commit)
       via  86ca6de85fd0cd90aa6e34464ef4c0b5b6e38be7 (commit)
      from  cb9d2e064c8e34802ba5a661e745a4ac310be0dd (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 eb952ad75fb9815781f3bf5ef53765eebc4607ff
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Mar 23 12:08:58 2021 -0500

    In icom.c have set_vfo return RIG_OK immediately when VFO_CURR is requested
    https://github.com/Hamlib/Hamlib/issues/625

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 06d399e5..015d89c7 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -7616,6 +7616,7 @@ static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo)
         rig_debug(RIG_DEBUG_TRACE, "%s: Asking for currVFO,  currVFO=%s\n", __func__,
                   rig_strvfo(rig->state.current_vfo));
         vfo = rig->state.current_vfo;
+        RETURNFUNC(RIG_OK);
     }
 
     if (vfo == RIG_VFO_MAIN && VFO_HAS_A_B_ONLY)

commit 86ca6de85fd0cd90aa6e34464ef4c0b5b6e38be7
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Mar 23 11:03:57 2021 -0500

    Change rig_get_freq call to use VFO_CURR instead of vfo to avoid looping
    https://github.com/Hamlib/Hamlib/issues/625

diff --git a/src/rig.c b/src/rig.c
index 27c95a23..9011d472 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2491,7 +2491,7 @@ 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)
     {
-        retcode = caps->get_freq(rig, vfo, &curr_freq);
+        retcode = caps->get_freq(rig, RIG_VFO_CURR, &curr_freq);
         rig_debug(RIG_DEBUG_TRACE, "%s: retcode from rig_get_freq = %.10000s\n",
                   __func__,
                   rigerror(retcode));

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

Summary of changes:
 rigs/icom/icom.c | 1 +
 src/rig.c        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


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