From 32ce1bae50706daf6d8e3bba5d135f69fa23ff70 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sun, 12 Dec 2021 23:42:00 -0600 Subject: [PATCH] Fix no-autopower and echo off for Icom https://github.com/Hamlib/Hamlib/issues/885 --- rigs/icom/icom.c | 5 ++++- rigs/icom/icom.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index e69e9092a..7d5675368 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -943,7 +943,10 @@ icom_rig_open(RIG *rig) retry_open: retval_echo = icom_get_usb_echo_off(rig); - if (retval_echo == 0 || retval_echo == 1) // then we know our echo status + if (retval_echo == 0 || retval_echo == 1) { retval = RIG_OK; } + else { retval = retval_echo; } + + if (retval == RIG_OK) // then we know our echo status { rig->state.current_vfo = icom_current_vfo(rig); // some rigs like the IC7100 still echo when in standby diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index cdf9c97ca..71ec89185 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "20211212" +#define BACKEND_VER "20211213" #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)