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

[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  dff7bdd7a79e33de446f10f87dea5dbd5bc9ca45 (commit)
      from  a42e13351b6fe6901b83d5aaa8ee5facc264d9b1 (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 dff7bdd7a79e33de446f10f87dea5dbd5bc9ca45
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Mar 13 08:03:53 2021 -0600

    For icom recognize bad command return packets e.g. fe fe e0 50 fa fd
    https://github.com/Hamlib/Hamlib/issues/607

diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index af49e19a..c5c2d256 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -279,6 +279,9 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
     }
 
     if (frm_len < ACKFRMLEN) { RETURNFUNC(-RIG_EPROTO); }
+    // if we send a bad command we will get back a NAK packet
+    // e.g. fe fe e0 50 fa fd
+    if (NAK == buf[frm_len - 2]) { RETURNFUNC(-RIG_ERJCTED); }
 
     rig_debug(RIG_DEBUG_TRACE, "%s: frm_len=%d, frm_len-1=%02x, frm_len-2=%02x\n", __func__, frm_len, buf[frm_len-1], buf[frm_len-2]);
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index b9eb6eaa..88d24f8a 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210310"
+#define BACKEND_VER "20210313"
 
 /*
  * defines used by comp_cal_str in rig.c

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

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


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