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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/649/head
Michael Black W9MDB 2021-03-31 11:41:06 -05:00
rodzic 36fbb26655 169c0ed2b5
commit c6608569fc
1 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
src/rig.c
Wyświetl plik

@ -3535,10 +3535,20 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
caps = rig->caps; caps = rig->caps;
/* Use previously setup TxVFO */
if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX)
{
tx_vfo = rig->state.tx_vfo;
}
else
{
tx_vfo = vfo;
}
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
|| vfo == rig->state.current_vfo)) || tx_vfo == rig->state.current_vfo))
{ {
retcode = caps->set_split_freq(rig, vfo, tx_freq); retcode = caps->set_split_freq(rig, vfo, tx_freq);
RETURNFUNC(retcode); RETURNFUNC(retcode);
@ -3550,16 +3560,6 @@ 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;
/* Use previously setup TxVFO */
if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX)
{
tx_vfo = rig->state.tx_vfo;
}
else
{
tx_vfo = vfo;
}
if (caps->set_freq && (caps->targetable_vfo & RIG_TARGETABLE_FREQ)) if (caps->set_freq && (caps->targetable_vfo & RIG_TARGETABLE_FREQ))
{ {
int retry = 3; int retry = 3;