[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-46-g133a8acd

[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  133a8acd30dcc21eef468e021a6e04ec424fd922 (commit)
       via  c7eec2c7887209da4e288acdd4143d055d54f04b (commit)
       via  4efbddd0e8f51054beb8b63c0038af82eb19c83f (commit)
      from  614ffe8dab047d2b34d3fe6acf25e631eef65140 (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 133a8acd30dcc21eef468e021a6e04ec424fd922
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Jul 20 14:42:46 2020 +0200

    Fix icom MainA/B SubA/B VFO selection
    https://github.com/Hamlib/Hamlib/issues/348

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 5878979c..f79773c6 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2096,7 +2096,8 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
 
     case RIG_VFO_MAIN_A:    // we need to select Main before setting VFO
     case RIG_VFO_MAIN_B:
-        retval = icom_transaction(rig, C_SET_VFO, RIG_VFO_MAIN, NULL, 0,
+	rig_debug(RIG_DEBUG_VERBOSE, "%s: MainA/B logic\n", __func__);
+        retval = icom_transaction(rig, C_SET_VFO, S_MAIN, NULL, 0,
                                   ackbuf, &ack_len);
 
         if (retval != RIG_OK)
@@ -2111,13 +2112,14 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        icvfo = RIG_VFO_MAIN_A ? S_VFOA : S_VFOB;
+        icvfo = vfo == RIG_VFO_MAIN_A ? S_VFOA : S_VFOB;
 
         break;
 
     case RIG_VFO_SUB_A: // we need to select Sub before setting VFO
     case RIG_VFO_SUB_B:
-        retval = icom_transaction(rig, C_SET_VFO, RIG_VFO_SUB, NULL, 0,
+	rig_debug(RIG_DEBUG_VERBOSE, "%s: SubA/B logic\n", __func__);
+        retval = icom_transaction(rig, C_SET_VFO, S_SUB, NULL, 0,
                                   ackbuf, &ack_len);
 
         if (retval != RIG_OK)
@@ -2132,7 +2134,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        icvfo = RIG_VFO_SUB_A ? S_VFOA : S_VFOB;
+        icvfo = vfo == RIG_VFO_SUB_A ? S_VFOA : S_VFOB;
 
         break;
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index f016345a..07e391a0 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20200719"
+#define BACKEND_VER "20200720"
 
 /*
  * defines used by comp_cal_str in rig.c

commit c7eec2c7887209da4e288acdd4143d055d54f04b
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sun Jul 19 17:24:04 2020 -0500

    Add comment to flex6xxx.c

diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 4dd6f720..a1f598c2 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -72,10 +72,10 @@ static rmode_t powersdr_mode_table[KENWOOD_MODE_TABLE_MAX] =
     [5] = RIG_MODE_FM,
     [6] = RIG_MODE_AM,
     [7] = RIG_MODE_PKTUSB,
-    [8] = RIG_MODE_NONE,
+    [8] = RIG_MODE_NONE, // SPEC -- not implemented
     [8] = RIG_MODE_PKTLSB,
     [10] = RIG_MODE_SAM,
-    [11] = RIG_MODE_NONE
+    [11] = RIG_MODE_NONE // DRM -- not implemented
 };
 
 static struct kenwood_priv_caps f6k_priv_caps  =

commit 4efbddd0e8f51054beb8b63c0038af82eb19c83f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sun Jul 19 17:21:23 2020 -0500

    Add ability to set Icom MAIN_VFO_A/B and SUB_VFO_A/B
    https://github.com/Hamlib/Hamlib/issues/348

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 5e8af135..5878979c 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2111,8 +2111,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        rig->state.current_vfo = vfo;
-        return RIG_OK;
+        icvfo = RIG_VFO_MAIN_A ? S_VFOA : S_VFOB;
 
         break;
 
@@ -2133,8 +2132,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        rig->state.current_vfo = vfo;
-        return RIG_OK;
+        icvfo = RIG_VFO_SUB_A ? S_VFOA : S_VFOB;
 
         break;
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 5efb6283..f016345a 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20200715"
+#define BACKEND_VER "20200719"
 
 /*
  * defines used by comp_cal_str in rig.c

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

Summary of changes:
 rigs/icom/icom.c        | 12 ++++++------
 rigs/icom/icom.h        |  2 +-
 rigs/kenwood/flex6xxx.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)


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