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

[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  c1277b170e0444b1de1d55012e6024c983a5e24e (commit)
       via  5b74438b7679221a96650cea7d6bf33421774c67 (commit)
      from  b9cc75c4a020e7a800c03ba64d74fc7a6d6fe6a4 (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 c1277b170e0444b1de1d55012e6024c983a5e24e
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 18 22:46:45 2021 -0500

    Fix Icom icom_get_usb_echo_off to read the freq response when echo is on
    This takes into account whatever the response time of the rig is
    https://github.com/Hamlib/Hamlib/issues/615

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 481c24d2..d12721e4 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -730,8 +730,13 @@ int icom_get_usb_echo_off(RIG *rig)
 
     if (ack_len == 1) // then we got an echo of the cmd
     {
+        struct rig_state *rs = &rig->state;
+        unsigned char buf[16];
         priv->serial_USB_echo_off = 0;
         rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo on detected\n", __func__);
+        // we should have a freq response so we'll read it and don't really care
+        // flushing doesn't always work as it depends on timing
+        read_icom_frame(&rs->rigport,buf,sizeof(buf));
     }
     else
     {
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index c3959eae..9127cc62 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210316"
+#define BACKEND_VER "20210318"
 
 /*
  * defines used by comp_cal_str in rig.c

commit 5b74438b7679221a96650cea7d6bf33421774c67
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 18 17:11:19 2021 -0500

    DDon't do band select on FDX3000 -- seems to have a problem putting split on all the time

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 105f4098..cb1039ae 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -894,8 +894,10 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
             && !rig->state.disable_yaesu_bandselect
             // remove the split check here -- hopefully works OK
             //&& !rig->state.cache.split
+            // seems some rigs are problematic
+            && !(is_ftdx3000)
             // some rigs can't do BS command on 60M
-            && !(is_ftdx3000 && newcat_band_index(freq) == 2)
+            // && !(is_ftdx3000 && newcat_band_index(freq) == 2)
             && !(is_ft2000 && newcat_band_index(freq) == 2)
             && !(is_ftdx1200 && newcat_band_index(freq) == 2)
             && !is_ft891 // 891 does not remember bandwidth so don't do this

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

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


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