diff --git a/rigs/icom/ic707.c b/rigs/icom/ic707.c index 0cc6e66f4..da5ab31b9 100644 --- a/rigs/icom/ic707.c +++ b/rigs/icom/ic707.c @@ -40,7 +40,7 @@ #define IC707_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) -#define IC707_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_STOP|RIG_SCAN_SLCT) +#define IC707_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_STOP) #define IC707_ANTS RIG_ANT_1 @@ -59,7 +59,7 @@ struct rig_caps ic707_caps = RIG_MODEL(RIG_MODEL_IC707), .model_name = "IC-707", .mfg_name = "Icom", - .version = BACKEND_VER ".2", + .version = BACKEND_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 7e227e40b..b95eebcde 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -8675,9 +8675,10 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) scan_sc = S_SCAN_STOP; break; + case RIG_SCAN_VFO: case RIG_SCAN_MEM: HAMLIB_TRACE; - retval = rig_set_vfo(rig, RIG_VFO_MEM); + retval = rig_set_vfo(rig, scan==RIG_SCAN_MEM?RIG_VFO_MEM:RIG_VFO_A); if (retval != RIG_OK) { @@ -8688,7 +8689,7 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) * but some old models don't have it. * Should be put in icom_priv_caps ? */ - if (rig->caps->rig_type == RIG_TYPE_RECEIVER) + if (rig->caps->rig_type == RIG_TYPE_RECEIVER && scan == RIG_SCAN_MEM) { scan_sc = S_SCAN_MEM2; } @@ -8738,7 +8739,7 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) break; default: - rig_debug(RIG_DEBUG_ERR, "%s: unsupported scan %#x", __func__, scan); + rig_debug(RIG_DEBUG_ERR, "%s: unsupported scan %#x\n", __func__, scan); RETURNFUNC(-RIG_EINVAL); } diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index 15e1559c2..80c0eff6a 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -35,7 +35,7 @@ #include #endif -#define BACKEND_VER "20241005" +#define BACKEND_VER "20241007" #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31) #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)