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

[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  f0a82fa2bf39225d03dea0bef9f05144cd55ac6a (commit)
      from  79b5142c4435cf3dbfe9dbbbd28604b618b80bec (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 f0a82fa2bf39225d03dea0bef9f05144cd55ac6a
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Mar 22 07:54:46 2021 -0500

    Fix icom.c vfo detection
    https://github.com/Hamlib/Hamlib/issues/624

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 5e01ee62..8c878da1 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -515,7 +515,7 @@ typedef unsigned int vfo_t;
 #define VFO_HAS_MAIN_SUB_A_B_ONLY (VFO_HAS_A_B & VFO_HAS_MAIN_SUB)
 #define VFO_HAS_A_B_ONLY (VFO_HAS_A_B & (!VFO_HAS_MAIN_SUB))
 #define VFO_DUAL (RIG_VFO_MAIN_A|RIG_VFO_MAIN_B|RIG_VFO_SUB_A|RIG_VFO_SUB_B)
-#define VFO_HAS_DUAL ((rig->state.vfo_list & VFO_DUAL == VFO_DUAL)
+#define VFO_HAS_DUAL ((rig->state.vfo_list & VFO_DUAL) == VFO_DUAL)
 //! @endcond
 
 /**
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index f3686cbe..029a86ca 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2098,12 +2098,12 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
         else if (VFO_HAS_MAIN_SUB_A_B_ONLY && rig->state.cache.satmode) { vfo = RIG_VFO_SUB; }
     }
 
-    else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_MAIN_SUB_A_B_ONLY)
+    else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_DUAL)
     {
         // If we're being asked for A/Main but we are a MainA/MainB rig change it
         vfo = RIG_VFO_MAIN_A;
     } 
-    else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_MAIN_SUB_A_B_ONLY)
+    else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_DUAL)
     {
         // If we're being asked for B/Sub but we are a MainA/MainB rig change it
         vfo = RIG_VFO_MAIN_B;
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 6a000848..dc1cc394 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210320"
+#define BACKEND_VER "20210322"
 
 /*
  * defines used by comp_cal_str in rig.c

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

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


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