From a0cd186b68e2b81d0fa4e8d00f342d73c5ca76aa Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 21 Apr 2023 16:12:53 -0500 Subject: [PATCH] Only allow x25cmdfails when not set https://github.com/Hamlib/Hamlib/issues/1277 --- 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 de5e18716..bde2e05d4 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -686,7 +686,7 @@ int icom_init(RIG *rig) priv->rx_vfo = RIG_VFO_NONE; rig->state.current_vfo = RIG_VFO_NONE; priv->filter = RIG_PASSBAND_NOCHANGE; - priv->x25cmdfails = 0; + priv->x25cmdfails = -1; priv->x1cx03cmdfails = 0; // we can add rigs here that will never use the 0x25 cmd @@ -1656,7 +1656,8 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (retval != RIG_OK) { - priv->x25cmdfails = 1; + // only reset if not known -- means cannot change dynamically without restart + if (priv->x25cmdfails < 0) priv->x25cmdfails = 1; rig_debug(RIG_DEBUG_WARN, "%s: rig probe shows 0x25 CI-V cmd not available\n", __func__); } diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index efc28fa4f..0661336be 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -31,7 +31,7 @@ #include #endif -#define BACKEND_VER "20230109" +#define BACKEND_VER "20230421" #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31) #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)