From 592ca86fc6b52257576df0af4e73b98b7ba3ad07 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sun, 1 Aug 2021 12:11:46 -0500 Subject: [PATCH] Allow Main/Sub to be returned from vfo_fixup --- src/misc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/misc.c b/src/misc.c index d9e3032e7..b1b95ec5e 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1735,9 +1735,9 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo) return vfo; // don't modify vfo for RIG_VFO_CURR } - if (vfo == RIG_VFO_RX || vfo == RIG_VFO_A) + if (vfo == RIG_VFO_RX || vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) { - vfo = RIG_VFO_A; + vfo = RIG_VFO_A; // default to mapping VFO_MAIN to VFO_A if (VFO_HAS_MAIN_SUB_ONLY) { vfo = RIG_VFO_MAIN; } @@ -1779,6 +1779,10 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo) else if (vfo == RIG_VFO_B) { + if (VFO_HAS_MAIN_SUB_ONLY) { vfo = RIG_VFO_SUB; } + + if (VFO_HAS_MAIN_SUB_A_B_ONLY) { vfo = RIG_VFO_SUB; } + rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo)); }