From 10e4e36aa2547f782ce52e8cc9fa4a7643f4c79f Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 13 Apr 2021 22:22:05 -0500 Subject: [PATCH] Remove MAIN and SUB VFOs from ic7100.c -- rig doesn't have them These have been in there for 8 years but just got exposed as a bug with new VFO handling https://github.com/Hamlib/Hamlib/issues/660 --- rigs/dummy/netrigctl.c | 10 ++++++++++ rigs/icom/ic7100.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index 00d17590f..bb85e9d05 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -328,6 +328,16 @@ static int netrigctl_open(RIG *rig) { break; } + switch(i) + { + } + rig->caps->tx_range_list1->startf = rs->tx_range_list[i].startf; + rig->caps->tx_range_list1->endf = rs->tx_range_list[i].endf; + rig->caps->tx_range_list1->modes = rs->tx_range_list[i].modes; + rig->caps->tx_range_list1->low_power = rs->tx_range_list[i].low_power; + rig->caps->tx_range_list1->high_power = rs->tx_range_list[i].high_power; + rig->caps->tx_range_list1->vfo = rs->tx_range_list[i].vfo; + rig->caps->tx_range_list1->ant = rs->tx_range_list[i].ant; } for (i = 0; i < HAMLIB_TSLSTSIZ; i++) diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index 6eb03b2d6..c4f09c1b3 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -41,7 +41,7 @@ #define IC7100_OTHER_TX_MODES ((IC7100_MODES) & ~(RIG_MODE_AM|RIG_MODE_PKTAM)) -#define IC7100_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) +#define IC7100_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC7100_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_SLCT|RIG_SCAN_PRIO)