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-04-02 08:04:37 -05:00
rodzic 33f299d16d 8e1fae4ea4
commit 0794e6e1e6
2 zmienionych plików z 8 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
configure.ac
Wyświetl plik

@ -578,12 +578,6 @@ dnl Determine whether to install pytest.py or py3test.py to $(docdir)/examples
AM_PYTHON_CHECK_VERSION([${PYTHON}], [3.0], [pyver_3="yes"], [pyver_3="no"])
AM_CONDITIONAL([PYVER_3], [test x"${pyver_3}" = x"yes"])
dnl Determine whether to link libpython as it is unneeded for Python >= 3.8
AM_PYTHON_CHECK_VERSION([${PYTHON}], [3.8], [pyver_3_8="yes"], [pyver_3_8="no"])
AS_IF([test x"${pyver_3_8}" = "xyes"],[
PYTHON_LIBS=""
])
# Tcl binding
AC_MSG_CHECKING([Whether to build Tcl bindings])
AC_ARG_WITH([tcl-binding],

15
src/rig.c
Wyświetl plik

@ -3571,7 +3571,7 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (retcode != RIG_OK) { RETURNFUNC(retcode); }
#if 0 // this verification seems to be causing bad behavior on some reigs
#if 0 // this verification seems to be causing bad behavior on some rigs
retcode = rig_get_freq(rig, tx_vfo, &tfreq);
#else
tfreq = tx_freq;
@ -3605,22 +3605,19 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
do
{
#if 0 // this verification seems to be causing bad behavior on some reigs
// doing get_freq seems to break on some rigs that can't read freq immediately after set
if (caps->set_split_freq)
{
retcode = caps->set_split_freq(rig, vfo, tx_freq);
rig_get_freq(rig, vfo, &tfreq);
//rig_get_freq(rig, vfo, &tfreq);
}
else
{
retcode = rig_set_freq(rig, RIG_VFO_CURR, tx_freq);
rig_get_freq(rig, vfo, &tfreq);
//rig_get_freq(rig, vfo, &tfreq);
}
#else
tfreq = tx_freq;
#endif
}
while (tfreq != tx_freq && retry-- > 0 && retcode == RIG_OK);
@ -4039,6 +4036,10 @@ int HAMLIB_API rig_set_split_freq_mode(RIG *rig,
caps = rig->caps;
// in split mode we alwasy use VFOB
// in the future we may start using RIG_VFO_TX and let the backend figure out what VFO to use
vfo = RIG_VFO_B; // in split mode we always use VFOB
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, tx_freq=%.0f, tx_mode=%s, tx_width=%d\n", __func__, rig_strvfo(vfo), tx_freq, rig_strrmode(tx_mode), (int)tx_width);
if (caps->set_split_freq_mode)
{