From dff7bdd7a79e33de446f10f87dea5dbd5bc9ca45 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sat, 13 Mar 2021 08:03:53 -0600 Subject: [PATCH] For icom recognize bad command return packets e.g. fe fe e0 50 fa fd https://github.com/Hamlib/Hamlib/issues/607 --- rigs/icom/frame.c | 3 +++ rigs/icom/icom.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index af49e19ab..c5c2d2568 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 b9eb6eaa1..88d24f8aa 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "20210310" +#define BACKEND_VER "20210313" /* * defines used by comp_cal_str in rig.c