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

[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  e589e078a11a38b76e1f84bfbc1ec0f74b32f3b5 (commit)
       via  76f3099aef7db03dd8ff5403c63ce39050140223 (commit)
      from  96e2cc7829bb7d640be6620ea0c56d3d0c4fbec2 (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 e589e078a11a38b76e1f84bfbc1ec0f74b32f3b5
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Feb 3 12:54:30 2021 -0600

    Add 3 second sleep in icom powerstat to allow the rig to wake up
    https://github.com/Hamlib/Hamlib/issues/525

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 307302fe..9c60086a 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -6231,6 +6231,7 @@ int icom_set_powerstat(RIG *rig, powerstat_t status)
         retval =
             icom_transaction(rig, C_SET_PWR, pwr_sc, NULL, 0, ackbuf, &ack_len);
         rs->rigport.retry = retry;
+        hl_usleep(3000*1000); // give it 3 seconds to wake up
 
         break;
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 4d87d12d..8e7923e3 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210129"
+#define BACKEND_VER "20210203"
 
 /*
  * defines used by comp_cal_str in rig.c

commit 76f3099aef7db03dd8ff5403c63ce39050140223
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Wed Feb 3 11:45:57 2021 -0600

    Remove 500ms from icom/frame.c -- should not be needed
    Reduce icom echo check to just 2 tries
    Improves power up sequencing by about 7 seconds
    https://github.com/Hamlib/Hamlib/issues/525

diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index c6d657aa..fab4a21e 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -320,8 +320,9 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
         {
             break;
         }
+        rig_debug(RIG_DEBUG_WARN, "%s: timeout retry=%d\n", __func__, retry);
 
-        hl_usleep(500 * 1000); // pause a half second
+        //hl_usleep(500 * 1000); // pause a half second -- don't think we need this
     }
     while (retry-- > 0);
 
@@ -330,7 +331,7 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
         rig_debug(RIG_DEBUG_VERBOSE, "%s: failed: %s\n", __func__, rigerror(retval));
     }
 
-    return retval;
+    RETURNFUNC(retval);
 }
 
 /* used in read_icom_frame as end of block */
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 455b7a7a..307302fe 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -704,7 +704,7 @@ int icom_get_usb_echo_off(RIG *rig)
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     // reduce the retry here so it's quicker
-    rs->rigport.retry = 1;
+    rs->rigport.retry = 0;
     // Check for echo on first
     priv->serial_USB_echo_off = 0;
 

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

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


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