diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index 857967413..76b393e65 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -123,7 +123,7 @@ static int netrigctl_vfostr(RIG *rig, char *vfostr, int len, vfo_t vfo) if (rig->state.vfo_opt) { - rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt vfo=%d\n", __func__, vfo); + rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt vfo=%u\n", __func__, vfo); char *myvfo; switch(vfo) { diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index b55c74146..5da32da83 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -5891,6 +5891,17 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) return err; } + if (is_ft950) + { // can't query SH in some modes + switch(rig->state.current_mode) + { + case RIG_MODE_FM: val->i = 12000; break; + case RIG_MODE_AM: val->i = 6000; break; + case RIG_MODE_AMN: val->i = 2400; break; + } + return RIG_OK; + } + if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) { main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';