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

[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  cb9d2e064c8e34802ba5a661e745a4ac310be0dd (commit)
      from  b90cd8b8c70f7a4158801443fe9789fc075fe06b (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 cb9d2e064c8e34802ba5a661e745a4ac310be0dd
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Mar 23 08:57:45 2021 -0500

    Comment out loop logic in rig_set_split_freq_mode -- seems to causing a permanent loop -- why?
    https://github.com/Hamlib/Hamlib/issues/625

diff --git a/src/rig.c b/src/rig.c
index 76c4b716..27c95a23 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3993,15 +3993,18 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
 
     if (caps->set_split_freq_mode)
     {
+#if 0
         freq_t tfreq;
         int retry = 3;
         int retcode2;
+#endif
 
+        retcode = caps->set_split_freq_mode(rig, vfo, tx_freq, tx_mode, tx_width);
+#if 0 // this verification seems to be causing bad behavior on some reigs
         // we query freq after set to ensure it really gets done
         do
         {
             retcode = caps->set_split_freq_mode(rig, vfo, tx_freq, tx_mode, tx_width);
-#if 0 // this verification seems to be causing bad behavior on some reigs
             retcode2 = rig_get_split_freq(rig, vfo, &tfreq);
 
             if (tfreq != tx_freq)
@@ -4011,15 +4014,14 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
                           tfreq, retry, retcode, retcode2);
                 hl_usleep(50 * 1000); // 50ms sleep may help here
             }
-#else
             tfreq = tx_freq;
             retcode2 = RIG_OK;
-#endif
         }
         while (tfreq != tx_freq && retry-- > 0 && retcode == RIG_OK
                 && retcode2 == RIG_OK);
 
         if (tfreq != tx_freq) { retcode = -RIG_EPROTO; }
+#endif
 
         RETURNFUNC(retcode);
     }

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

Summary of changes:
 src/rig.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


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