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

[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  421c6e7c4e4d6ef552ca39241463c71244b424a2 (commit)
      from  0806896e3be5f2465f52b5352d2ec5bf684616f9 (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 421c6e7c4e4d6ef552ca39241463c71244b424a2
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Sep 22 10:40:56 2021 -0500

    Fix icom.c get_mode to not ask for unselected VFO when VFO_CURR is requested
    https://github.com/Hamlib/Hamlib/issues/806

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 2438fd4e..05d9f7b6 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2196,7 +2196,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         vfo_t vfoask = vfo_fixup(rig, vfo, 0);
         vfo_t vfocurr = vfo_fixup(rig, rig->state.current_vfo, 0);
 
-        if (vfoask != vfocurr) { vfosel = 0x01; }
+        if (vfo != RIG_VFO_CURR && vfoask != vfocurr) { vfosel = 0x01; }
 
         // use cache for the non-selected VFO -- can't get it by VFO
         // this avoids vfo swapping but accurate answers for these rigs
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index acdfeed1..e6459b7f 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210921"
+#define BACKEND_VER "20210922"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)

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

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


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