kopia lustrzana https://github.com/Hamlib/Hamlib
Fix icom \get_mode in non-vfo mode to stay on VFOB/Sub
https://github.com/Hamlib/Hamlib/issues/676pull/680/head
rodzic
b6a29f1e16
commit
1d79b9e01c
|
@ -2108,8 +2108,8 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
||||||
if (vfo & (RIG_VFO_A | RIG_VFO_MAIN | RIG_VFO_SUB_A | RIG_VFO_MAIN_A |
|
if (vfo & (RIG_VFO_A | RIG_VFO_MAIN | RIG_VFO_SUB_A | RIG_VFO_MAIN_A |
|
||||||
RIG_VFO_CURR))
|
RIG_VFO_CURR))
|
||||||
{
|
{
|
||||||
// then we get our current vfo..i.e. VFOA
|
// then we get what was asked for
|
||||||
if (rig->state.current_vfo != RIG_VFO_A)
|
if (vfo == RIG_VFO_NONE)
|
||||||
{
|
{
|
||||||
rig_debug(RIG_DEBUG_TRACE, "%s(%d): forcing default VFO_A\n", __func__,
|
rig_debug(RIG_DEBUG_TRACE, "%s(%d): forcing default VFO_A\n", __func__,
|
||||||
__LINE__);
|
__LINE__);
|
||||||
|
|
|
@ -1895,6 +1895,8 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|
||||||
|
|
||||||
vfo = vfo_fixup(rig, vfo);
|
vfo = vfo_fixup(rig, vfo);
|
||||||
|
|
||||||
|
if (vfo == RIG_VFO_CURR) vfo = curr_vfo;
|
||||||
|
|
||||||
// we ignore get_freq for the uplink VFO for gpredict to behave better
|
// we ignore get_freq for the uplink VFO for gpredict to behave better
|
||||||
if ((rig->state.uplink == 1 && vfo == RIG_VFO_SUB)
|
if ((rig->state.uplink == 1 && vfo == RIG_VFO_SUB)
|
||||||
|| (rig->state.uplink == 2 && vfo == RIG_VFO_MAIN))
|
|| (rig->state.uplink == 2 && vfo == RIG_VFO_MAIN))
|
||||||
|
|
Ładowanie…
Reference in New Issue