From cc49669b494e736726b496fbec8e85b67904caf7 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Thu, 30 Nov 2023 10:31:56 -0600 Subject: [PATCH] Change Icom 0x26 behavior to leave filter# alone Rigs should remember filter based on last filter used for the mode --- rigs/icom/icom.c | 5 +++-- rigs/icom/icom.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index ce8f09006..7a4228750 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -950,6 +950,7 @@ static vfo_t icom_current_vfo(RIG *rig) } rig_debug(RIG_DEBUG_TRACE, "%s: currVFO=%s\n", __func__, rig_strvfo(currVFO)); + if (rig->state.current_vfo != RIG_VFO_NONE) currVFO = rig->state.current_vfo; return currVFO; } @@ -2211,9 +2212,9 @@ static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, int datamode, buf[1] = datamode; // filter fixed to filter 1 due to IC7300 bug defaulting to filter 2 on mode changed -- yuck!! // buf[2] = filter // if Icom ever fixed this - buf[2] = 1; + // buf[2] = 1; // let's skip the filter selection - retval = icom_transaction(rig, cmd2, subcmd2, buf, 3, ackbuf, &ack_len); + retval = icom_transaction(rig, cmd2, subcmd2, buf, 2, ackbuf, &ack_len); if (retval != RIG_OK) { diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index cc800675c..95bb0787a 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -35,7 +35,7 @@ #include #endif -#define BACKEND_VER "20231116" +#define BACKEND_VER "20231130" #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31) #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)