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

[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  c13624add0f0dcaffa55a99cb55695bcb8ab68fb (commit)
      from  207f28b2569888b0fa5a7da53f380f13f51e452b (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 c13624add0f0dcaffa55a99cb55695bcb8ab68fb
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 8 17:20:15 2021 -0600

    Fix flrig_set_split_freq_mode to allow set_freq but not set_mode during PTT
    https://github.com/Hamlib/Hamlib/issues/593

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 9556b19d..203ef8e2 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1861,12 +1861,6 @@ static int flrig_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t freq,
        RETURNFUNC(-RIG_ENTARGET);
    }
 
-   if (priv->ptt)
-   {
-       rig_debug(RIG_DEBUG_WARN, "%s call not made as PTT=1\n", __func__);
-       RETURNFUNC(RIG_OK);  // just return OK and ignore this
-   }
-
    retval = flrig_set_freq(rig, RIG_VFO_B, freq);
 
    if (retval != RIG_OK)
@@ -1882,6 +1876,12 @@ static int flrig_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t freq,
 
    if (qmode == priv->curr_modeA) { RETURNFUNC(RIG_OK); }
 
+   if (priv->ptt)
+   {
+       rig_debug(RIG_DEBUG_WARN, "%s set_mode call not made as PTT=1\n", __func__);
+       RETURNFUNC(RIG_OK);  // just return OK and ignore this
+   }
+
    retval = flrig_set_mode(rig, RIG_VFO_B, priv->curr_modeA, width);
 
    if (retval != RIG_OK)

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

Summary of changes:
 rigs/dummy/flrig.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


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