mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix some more unnecessary vfo swapping 

https://github.com/Hamlib/Hamlib/issues/762
https://github.com/Hamlib/Hamlib/issues/430
pull/788/head
Mike Black W9MDB 2021-08-27 15:46:23 -05:00 zatwierdzone przez Wouter van Gulik
rodzic 31696351a9
commit d5028e7ba4
1 zmienionych plików z 16 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
src/rig.c
Wyświetl plik

@ -3815,7 +3815,8 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (caps->set_split_freq if (caps->set_split_freq
&& (vfo == RIG_VFO_CURR && (vfo == RIG_VFO_CURR
|| vfo == RIG_VFO_TX || vfo == RIG_VFO_TX
|| tx_vfo == rig->state.current_vfo)) || tx_vfo == rig->state.current_vfo
|| (caps->targetable_vfo & RIG_TARGETABLE_FREQ)))
{ {
TRACE; TRACE;
retcode = caps->set_split_freq(rig, vfo, tx_freq); retcode = caps->set_split_freq(rig, vfo, tx_freq);
@ -3828,7 +3829,7 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
/* Assisted mode */ /* Assisted mode */
curr_vfo = rig->state.current_vfo; curr_vfo = rig->state.current_vfo;
if (caps->set_freq && (caps->targetable_vfo & RIG_TARGETABLE_FREQ)) if (caps->set_freq)
{ {
int retry = 3; int retry = 3;
freq_t tfreq; freq_t tfreq;
@ -3856,11 +3857,8 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
TRACE; TRACE;
retcode = RIG_OK; retcode = RIG_OK;
if (!(caps->targetable_vfo & RIG_TARGETABLE_FREQ))
{
retcode = caps->set_vfo(rig, tx_vfo); retcode = caps->set_vfo(rig, tx_vfo);
} }
}
else if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op) else if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op)
{ {
retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE); retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
@ -3994,7 +3992,8 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
if (caps->set_vfo) if (caps->set_vfo)
{ {
// if the underlying rig has OP_XCHG we don't need to set VFO // if the underlying rig has OP_XCHG we don't need to set VFO
if (!rig_has_vfo_op(rig, RIG_OP_XCHG)) if (!rig_has_vfo_op(rig, RIG_OP_XCHG)
&& !(caps->targetable_vfo & RIG_TARGETABLE_FREQ))
{ {
TRACE; TRACE;
retcode = caps->set_vfo(rig, tx_vfo); retcode = caps->set_vfo(rig, tx_vfo);
@ -4040,9 +4039,18 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
rig_debug(RIG_DEBUG_TRACE, "%s: restoring vfo=%s\n", __func__, rig_debug(RIG_DEBUG_TRACE, "%s: restoring vfo=%s\n", __func__,
rig_strvfo(save_vfo)); rig_strvfo(save_vfo));
TRACE; TRACE;
if (!rig_has_vfo_op(rig, RIG_OP_XCHG)
&& !(caps->targetable_vfo & RIG_TARGETABLE_FREQ))
{
rc2 = caps->set_vfo(rig, save_vfo); rc2 = caps->set_vfo(rig, save_vfo);
} }
else else
{
rc2 = RIG_OK;
}
}
else
{ {
rc2 = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE); rc2 = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
} }