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

[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  196ffb39a89acaa11177f50262dbcefd1585d3ad (commit)
       via  f01129958ec9a3feaac4c3253b0e384183c4515f (commit)
       via  60e9dd9742994e176c5043915647f7c070ae5fb0 (commit)
       via  f67429528b48e69464eb4d8f73c2d25f065071d3 (commit)
      from  8e20613771379d736e49c40e70b57b44be478f0d (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 196ffb39a89acaa11177f50262dbcefd1585d3ad
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 11 23:05:52 2021 -0600

    Update version in flrig.h

diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index 78eec490..a69e4ae1 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210308"
+#define BACKEND_VER "20210311"
 
 #define EOM "\r"
 #define TRUE 1

commit f01129958ec9a3feaac4c3253b0e384183c4515f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 11 23:03:53 2021 -0600

    Fix flrig vfo swapping when set_mode with bandwidth is done
    https://github.com/Hamlib/Hamlib/issues/602

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 517abf69..59dc5823 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1386,20 +1386,12 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
        sprintf(cmd_arg, "<params><param><value><i4>%ld</i4></value></param></params>",
                width);
 
-       // if we're not on VFOB but asking for VFOB still have to switch VFOS
-       if (!vfoSwitched && vfo == RIG_VFO_B) { flrig_set_vfo(rig, RIG_VFO_B); }
-
-       if (!vfoSwitched && vfo == RIG_VFO_A) { flrig_set_vfo(rig, RIG_VFO_A); }
-
-       retval = flrig_transaction(rig, "rig.set_bandwidth", cmd_arg, NULL,
-                                  0);
+       retval = flrig_transaction(rig, "rig.set_bandwidth", cmd_arg, NULL, 0);
 
        if (retval < 0)
        {
            RETURNFUNC(retval);
        }
-
-       flrig_set_vfo(rig, vfo); // ensure reset to our initial vfo
    }
 
    // Return to VFOA if needed

commit 60e9dd9742994e176c5043915647f7c070ae5fb0
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 11 22:34:38 2021 -0600

    Fix debug statement in flrig.c

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index b35ab253..517abf69 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1108,7 +1108,7 @@ static int flrig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
    else
    {
        cmd = "rig.set_vfoB";
-       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoA %.0f\n", freq);
+       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoB %.0f\n", freq);
        priv->curr_freqB = freq;
    }
 

commit f67429528b48e69464eb4d8f73c2d25f065071d3
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 11 22:31:37 2021 -0600

    Fix debug statements in flrig.c

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 203ef8e2..b35ab253 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1102,13 +1102,13 @@ static int flrig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
    if (vfo == RIG_VFO_A)
    {
        cmd = "rig.set_vfoA";
-       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoA %.0f", freq);
+       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoA %.0f\n", freq);
        priv->curr_freqA = freq;
    }
    else
    {
        cmd = "rig.set_vfoB";
-       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoA %.0f", freq);
+       rig_debug(RIG_DEBUG_TRACE, "rig.set_vfoA %.0f\n", freq);
        priv->curr_freqB = freq;
    }
 

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

Summary of changes:
 rigs/dummy/flrig.c | 14 +++-----------
 rigs/dummy/flrig.h |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)


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