From 328731921ef7cd4bfbda6553ab76f29cf8a9ffb7 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Thu, 4 Jul 2024 11:52:05 -0500 Subject: [PATCH] Discard Icom packets with E1 controller code These are async packets which were getting flushed but have to be handled individually. Have to hande these as generic flush before sending command breaks async packets when echo is on. https://github.com/Hamlib/Hamlib/issues/1575 --- rigs/icom/icom.c | 2 +- rigs/icom/icom.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index eea6eae27..1544bc605 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -2608,7 +2608,7 @@ static int icom_get_mode_without_data(RIG *rig, vfo_t vfo, rmode_t *mode, // Use command 0x26 to get selected/unselected or Main/Sub VFO mode, data mode and filter width // IC-7800 can set, but not read with 0x26 (although manual states otherwise?) - if ((rs->targetable_vfo & RIG_TARGETABLE_MODE) && !RIG_IS_IC7800 && !RIG_IS_IC7700 + if ((rs->targetable_vfo & RIG_TARGETABLE_MODE) && !RIG_IS_IC7800 && !force_vfo_swap) { retval = icom_get_mode_x26(rig, vfo, &mode_len, modebuf); diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index 2e17b95c8..f764b984d 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -35,7 +35,7 @@ #include #endif -#define BACKEND_VER "20240511" +#define BACKEND_VER "20240704" #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31) #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)