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

[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  9a82ebf65229131e6425231f521a31d6a7efa312 (commit)
      from  622257c3671bdc1f4e29dffcf0f6f0b48ffa30a2 (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 9a82ebf65229131e6425231f521a31d6a7efa312
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Tue Apr 27 10:00:10 2021 -0500

    Make icom.c 0x25 cmd check only try once
    https://github.com/Hamlib/Hamlib/issues/685

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 85f3a7db..2f76c30e 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2109,7 +2109,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
                    RIG_VFO_CURR))
         {
             // then we get what was asked for
-            if (vfo == RIG_VFO_NONE)
+            if (vfo == RIG_VFO_NONE && rig->state.current_vfo == RIG_VFO_NONE)
             {
                 rig_debug(RIG_DEBUG_TRACE, "%s(%d): forcing default VFO_A\n", __func__,
                           __LINE__);
@@ -4491,11 +4491,14 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
         {
             if (priv->x25cmdfails == 0)
             {
+                int retry_save = rs->rigport.retry;
+                rs->rigport.retry = 0;
                 cmd = C_SEND_SEL_FREQ;
                 subcmd = 0x01; // get the unselected vfo
                 retval = icom_transaction(rig, cmd, subcmd, NULL, 0, ackbuf,
                                           &ack_len);
 
+                rs->rigport.retry = retry_save;
                 if (retval == RIG_OK) // then we're done!!
                 {
                     *tx_freq = from_bcd(ackbuf + 2, (priv->civ_731_mode ? 4 : 5) * 2);
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 0f62d073..564b519e 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210419"
+#define BACKEND_VER "20210427"
 
 /*
  * defines used by comp_cal_str in rig.c

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

Summary of changes:
 rigs/icom/icom.c | 5 ++++-
 rigs/icom/icom.h | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


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