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

[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  004efafda7de9cea82aaf694f5224f96977c828a (commit)
       via  9efa3c7259851326688213e0c1d4f1f4f3039e8f (commit)
       via  996dbbfa1a7cd325d0c5c7efc7f9f5c33733aca5 (commit)
      from  f552e3f0e8900e9285b23770a590e07cbc16b90a (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 004efafda7de9cea82aaf694f5224f96977c828a
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 17:09:27 2021 -0500

    Remove unnecessary set_mode command from TARGETABLE_MODE Icom rigs
    https://github.com/Hamlib/Hamlib/issues/762
    https://github.com/Hamlib/Hamlib/issues/430

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c4466300..6f3e187c 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1809,7 +1809,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     switch (mode)
     {
-#if 0 // don't think this is needed anymore -- W9MDB 20210828
+
     case RIG_MODE_PKTUSB:
         // xFE xFE x6E xE0 x1A x06 x01 xFD switches mod input from MIC to ACC
         // This apparently works for IC-756ProIII but nobody has asked for it yet
@@ -1827,7 +1827,6 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     case RIG_MODE_PKTAM:
         icom_mode = RIG_MODE_AM;
         break;
-#endif
 
     default:
         icom_mode = mode;
@@ -1837,7 +1836,16 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     rig_debug(RIG_DEBUG_VERBOSE, "%s mode=%d, width=%d, curr_vfo=%s\n", __func__,
               (int)icom_mode,
               (int)width, rig_strvfo(rig->state.current_vfo));
-    retval = icom_set_mode(rig, vfo, icom_mode, width);
+
+    // we only need to change base mode if we aren't using cmd 26 later
+    if (!(rig->caps->targetable_vfo & RIG_TARGETABLE_MODE))
+    {
+        retval = icom_set_mode(rig, vfo, icom_mode, width);
+    }
+    else
+    {
+        retval = RIG_OK;
+    }
 
     hl_usleep(50 * 1000); // pause for possible transceive message which we'll flush
 

commit 9efa3c7259851326688213e0c1d4f1f4f3039e8f
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 10:31:00 2021 -0500

    Fix testcache.c

diff --git a/tests/testcache.c b/tests/testcache.c
index 9451aac2..f0485c24 100644
--- a/tests/testcache.c
+++ b/tests/testcache.c
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
     rig_get_split_vfo(my_rig, RIG_VFO_A, &split, &tx_vfo);
     printf("split=%d, tx_vfo=%s\n", split, rig_strvfo(tx_vfo));
 
-    if (split != RIG_SPLIT_ON || tx_vfo != RIG_VFO_B) { printf("split#2 failed\n"); exit(1); }
+    if (split != RIG_SPLIT_ON || (tx_vfo != RIG_VFO_B && tx_vfo != RIG_VFO_SUB)) { printf("split#2 failed\n"); exit(1); }
 
     printf("All OK\n");
     rig_close(my_rig);

commit 996dbbfa1a7cd325d0c5c7efc7f9f5c33733aca5
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat Aug 28 10:21:16 2021 -0500

    Remove override of PKTUSB mode for Icom rigs -- don't think we need this
    Was causing mode toggling on IC7300 during PTT transitions in JTDX

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 7880b04f..c4466300 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1809,6 +1809,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
 
     switch (mode)
     {
+#if 0 // don't think this is needed anymore -- W9MDB 20210828
     case RIG_MODE_PKTUSB:
         // xFE xFE x6E xE0 x1A x06 x01 xFD switches mod input from MIC to ACC
         // This apparently works for IC-756ProIII but nobody has asked for it yet
@@ -1826,6 +1827,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
     case RIG_MODE_PKTAM:
         icom_mode = RIG_MODE_AM;
         break;
+#endif
 
     default:
         icom_mode = mode;
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index b765dcaf..d13f9d65 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210824"
+#define BACKEND_VER "20210828"
 
 #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  | 12 +++++++++++-
 rigs/icom/icom.h  |  2 +-
 tests/testcache.c |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)


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