FT-736 did not have get_mode so only call get_mode when available

https://github.com/Hamlib/Hamlib/issues/1187
pull/1215/head
Mike Black W9MDB 2022-12-17 09:59:04 -06:00
rodzic 250a5b0211
commit 120c580de0
1 zmienionych plików z 13 dodań i 8 usunięć

Wyświetl plik

@ -1344,14 +1344,18 @@ int HAMLIB_API rig_open(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Current split=%d, tx_vfo=%s\n", __func__,
__LINE__, split, rig_strvfo(tx_vfo));
rmode_t mode;
pbwidth_t width;
rig_get_mode(rig, RIG_VFO_A, &mode, &width);
pbwidth_t width = 2400; // we'll use 2400Hz as default width
if (split)
if (rig->caps->get_mode)
{
rig_debug(RIG_DEBUG_VERBOSE, "xxxsplit=%d\n", split);
HAMLIB_TRACE;
rig_get_mode(rig, RIG_VFO_B, &mode, &width);
rig_get_mode(rig, RIG_VFO_A, &mode, &width);
if (split)
{
rig_debug(RIG_DEBUG_VERBOSE, "xxxsplit=%d\n", split);
HAMLIB_TRACE;
rig_get_mode(rig, RIG_VFO_B, &mode, &width);
}
}
}
}
@ -2891,7 +2895,8 @@ int HAMLIB_API rig_get_vfo(RIG *rig, vfo_t *vfo)
if (cache_ms < rig->state.cache.timeout_ms)
{
*vfo = rig->state.cache.vfo;
rig_debug(RIG_DEBUG_TRACE, "%s: cache hit age=%dms, vfo=%s\n", __func__, cache_ms, rig_strvfo(*vfo));
rig_debug(RIG_DEBUG_TRACE, "%s: cache hit age=%dms, vfo=%s\n", __func__,
cache_ms, rig_strvfo(*vfo));
ELAPSED2;
RETURNFUNC(RIG_OK);
}
@ -4424,7 +4429,7 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
if (tx_vfo == RIG_VFO_B || tx_vfo == RIG_VFO_SUB) { rx_vfo = RIG_VFO_A; }
if (vfo == RIG_VFO_CURR && tx_vfo == RIG_VFO_B) { rx_vfo = RIG_VFO_A; }
if (vfo == RIG_VFO_CURR && tx_vfo == RIG_VFO_B) { rx_vfo = RIG_VFO_A; }
else if (vfo == RIG_VFO_CURR && tx_vfo == RIG_VFO_A) { rx_vfo = RIG_VFO_B; }
else if (vfo == RIG_VFO_CURR && tx_vfo == RIG_VFO_MAIN) { rx_vfo = RIG_VFO_SUB; }
else if (vfo == RIG_VFO_CURR && tx_vfo == RIG_VFO_SUB) { rx_vfo = RIG_VFO_MAIN; }