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

[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  207f28b2569888b0fa5a7da53f380f13f51e452b (commit)
       via  28a828b5b8516475192ca8eec2a7b7d479d5affd (commit)
       via  0ad32a4f8a0e81f8028ca9a35c209c45c7fa876f (commit)
       via  491bf07c0dc3a1d8a8f7d94634d64d04c680c393 (commit)
      from  caafe10d7bd658ce9418747ca8ac1b4f04c2c3b7 (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 207f28b2569888b0fa5a7da53f380f13f51e452b
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 8 16:59:22 2021 -0600

    Add debug to rig.c
    https://github.com/Hamlib/Hamlib/issues/593

diff --git a/src/rig.c b/src/rig.c
index 6e1da02f..dd77e10c 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3880,6 +3880,11 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
         {
             retcode = caps->set_split_freq_mode(rig, vfo, tx_freq, tx_mode, tx_width);
             retcode2 = rig_get_split_freq(rig, vfo, &tfreq);
+            if (tfreq != tx_freq)
+            {
+                rig_debug(RIG_DEBUG_ERR, "%s: txfreq!=tfreq %.0f!=%.0f, retry=%d, rc1=%d, rc2=%d\n", __func__, tx_freq, tfreq, retry, retcode, retcode2);
+                hl_usleep(50*1000); // 50ms sleep may help here
+            }
         }
         while (tfreq != tx_freq && retry-- > 0 && retcode == RIG_OK
                 && retcode2 == RIG_OK);

commit 28a828b5b8516475192ca8eec2a7b7d479d5affd
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 8 16:54:52 2021 -0600

    Add ENTERFUNC to flrig.c
    https://github.com/Hamlib/Hamlib/issues/593

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 80c196c0..9556b19d 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1009,7 +1009,7 @@ static int flrig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
    char value[MAXARGLEN];
    struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv;
 
-   rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__);
+   ENTERFUNC;
    rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s\n", __func__,
              rig_strvfo(vfo));
 

commit 0ad32a4f8a0e81f8028ca9a35c209c45c7fa876f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 8 16:44:29 2021 -0600

    Update logic to suppress bogus set freq error

diff --git a/src/rig.c b/src/rig.c
index 59036160..6e1da02f 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1616,7 +1616,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         }
         while (tfreq != freq && retry-- > 0);
 
-        if (retry == 0)
+        if (retry == 0 && tfreq != freq)
         {
             rig_debug(RIG_DEBUG_ERR, "%s: unable to set frequency!!, asked for %.0f, got %.0f\n", __func__, freq, tfreq);
         }

commit 491bf07c0dc3a1d8a8f7d94634d64d04c680c393
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 8 16:43:05 2021 -0600

    Update comment in flrig.c

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index b99d64e4..80c196c0 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -1275,7 +1275,7 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 
    if (priv->ptt)
    {
-       rig_debug(RIG_DEBUG_WARN, "%s call not made as PTT=1\n", __func__);
+       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
    }
 

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

Summary of changes:
 rigs/dummy/flrig.c | 4 ++--
 src/rig.c          | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)


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