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

Remove #defines for rig_set_split and return to standard call

pull/1119/head
Mike Black W9MDB 2022-08-27 07:36:14 -05:00
rodzic b3d69d221e
commit 1aed27c71a
3 zmienionych plików z 5 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
include/hamlib/rig.h
Wyświetl plik

@ -2842,9 +2842,6 @@ rig_get_split_vfo HAMLIB_PARAMS((RIG *,
split_t *split,
vfo_t *tx_vfo));
#define rig_set_split(r,v,s) rig_set_split_vfo((r),(v),(s),RIG_VFO_CURR)
#define rig_get_split(r,v,s) ({ vfo_t _tx_vfo; rig_get_split_vfo((r),(v),(s),&_tx_vfo); })
extern HAMLIB_EXPORT(int)
rig_set_rit HAMLIB_PARAMS((RIG *rig,
vfo_t vfo,

5
rigs/kenwood/kenwood.c
Wyświetl plik

@ -1390,7 +1390,8 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
RETURNFUNC2(-RIG_EINVAL);
}
rig_get_split(rig, vfo, &tsplit);
vfo_t tx_vfo;
rig_get_split_vfo(rig, vfo, &tsplit, &tx_vfo);
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): tsplit=%d, split=%d\n", __func__,
__LINE__, tsplit, split);
@ -1487,7 +1488,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
and all other rigs don't need to set it if it's already set correctly
*/
tsplit = RIG_SPLIT_OFF; // default in case rig does not set split status
retval = rig_get_split(rig, vfo, &tsplit);
retval = rig_get_split_vfo(rig, vfo, &tsplit, &tx_vfo);
priv->split = rig->state.cache.split = split;
rig->state.cache.split_vfo = txvfo;

3
src/rig.c
Wyświetl plik

@ -6916,7 +6916,8 @@ int HAMLIB_API rig_get_vfo_info(RIG *rig, vfo_t vfo, freq_t *freq,
*satmode = rig->state.cache.satmode;
// we should only need to ask for VFO_CURR to minimize display swapping
HAMLIB_TRACE;
retval = rig_get_split(rig, RIG_VFO_CURR, split);
vfo_t tx_vfo;
retval = rig_get_split_vfo(rig, RIG_VFO_CURR, split, &tx_vfo);
if (retval != RIG_OK) { RETURNFUNC(retval); }