From c01e55b09b164587f8b7ddfa8d910f39ec60b0ed Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Wed, 9 Oct 2024 08:35:59 -0500 Subject: [PATCH] Change icom_scan to use vfo argument to set vfo -- default VFO_CURR to just switching to vfo mode https://github.com/Hamlib/Hamlib/issues/1619#issuecomment-2402159608 --- rigs/icom/icom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index fcb4c7a4c..6d2b18ee5 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -8664,11 +8664,14 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) unsigned char ackbuf[MAXFRAMELEN]; int scan_len, ack_len = sizeof(ackbuf), retval; int scan_cn, scan_sc; + vfo_t myvfo = vfo; ENTERFUNC; scan_len = 0; scan_cn = C_CTL_SCAN; + // for current vfo just switch to VFO mode (we might be in MEM) + if (myvfo == RIG_VFO_CURR) myvfo = RIG_VFO_VFO; switch (scan) { case RIG_SCAN_STOP: @@ -8678,7 +8681,7 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) case RIG_SCAN_VFO: case RIG_SCAN_MEM: HAMLIB_TRACE; - retval = rig_set_vfo(rig, scan==RIG_SCAN_MEM?RIG_VFO_MEM:RIG_VFO_VFO); + retval = rig_set_vfo(rig, scan==RIG_SCAN_MEM?RIG_VFO_MEM:myvfo); if (retval != RIG_OK) {