From c04c4cbd2ae0b006b79b7fb84675807e0d173abf Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 27 Aug 2021 17:24:31 -0500 Subject: [PATCH] Remove another unneeded vfo swap from icom rigs https://github.com/Hamlib/Hamlib/issues/762 https://github.com/Hamlib/Hamlib/issues/430 --- rigs/icom/icom.c | 8 ++++++-- rigs/icom/icom.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 0ce03fda5..7880b04f5 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -1973,8 +1973,12 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) || rig->state.current_vfo == RIG_VFO_CURR)) { TRACE; - swapvfos = 1; - rig_set_vfo(rig, RIG_VFO_B); + + if (!(rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)) + { + swapvfos = 1; + rig_set_vfo(rig, RIG_VFO_B); + } } rig_debug(RIG_DEBUG_VERBOSE, "%s: #2 icmode=%d, icmode_ext=%d\n", __func__, diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index c937844c1..b765dcaf4 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "20210822" +#define BACKEND_VER "20210824" #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)