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

Fix rigctl/rigctld split ops/queries 

Add vfo_fixup function.  We should be able to do all vfo corrections in rig.c instead of backends.  So we're migrating that way....
https://github.com/Hamlib/Hamlib/issues/269
pull/281/head
Michael Black W9MDB 2020-05-30 09:34:13 -05:00
rodzic 9bafc86fec
commit 353066a232
2 zmienionych plików z 61 dodań i 35 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/icom/icom.c
Wyświetl plik

@ -3848,6 +3848,7 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
}
}
#if 0
retval = set_vfo_curr(rig, RIG_VFO_TX, RIG_VFO_TX);
if (retval != RIG_OK)
@ -3856,6 +3857,7 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
rigerror(retval));
return retval;
}
#endif
// If the rigs supports the 0x25 command we'll use it
// This eliminates VFO swapping and improves split operations

94
src/rig.c
Wyświetl plik

@ -189,6 +189,55 @@ static const char *rigerror_table[] =
#define ERROR_TBL_SZ (sizeof(rigerror_table)/sizeof(char *))
static vfo_t vfo_fixup(RIG *rig, vfo_t vfo)
{
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s\n", __func__, rig_strvfo(vfo));
if (vfo == RIG_VFO_RX)
{
vfo = RIG_VFO_A;
if (VFO_HAS_MAIN_SUB_ONLY) { vfo = RIG_VFO_MAIN; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY) { vfo = RIG_VFO_MAIN; }
}
if (vfo == RIG_VFO_TX)
{
int retval;
split_t split = 0;
// get split if we can -- it will default to off otherwise
// maybe split/satmode/vfo/freq/mode can be cached for rigs
// that don't have read capability or get_vfo like Icom?
// Icom's lack of get_vfo is problematic in this respect
// If we cache vfo or others than twiddling the rig may cause problems
retval = rig_get_split(rig, vfo, &split);
if (retval != RIG_OK)
{
split = rig->state.cache.split;
}
int satmode = rig->state.cache.satmode;
vfo = RIG_VFO_A;
if (split) { vfo = RIG_VFO_B; }
if (VFO_HAS_MAIN_SUB_ONLY && !split && !satmode) { vfo = RIG_VFO_MAIN; }
if (VFO_HAS_MAIN_SUB_ONLY && (split || satmode)) { vfo = RIG_VFO_SUB; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY && split) { vfo = RIG_VFO_B; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY && satmode) { vfo = RIG_VFO_SUB; }
rig_debug(RIG_DEBUG_TRACE,
"%s: RIG_VFO_TX changed to %s, split=%d, satmode=%d\n", __func__,
rig_strvfo(vfo), split, satmode);
}
rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo));
return vfo;
}
/*
* track which rig is opened (with rig_open)
* needed at least for transceive mode
@ -1223,6 +1272,8 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
caps = rig->caps;
vfo = vfo_fixup(rig, vfo);
if (rig->state.lo_freq != 0.0)
{
freq -= rig->state.lo_freq;
@ -1338,6 +1389,8 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
return -RIG_EINVAL;
}
vfo = vfo_fixup(rig, vfo);
cache_ms = elapsed_ms(&rig->state.cache.time_freq, ELAPSED_GET);
rig_debug(RIG_DEBUG_TRACE, "%s: cache check age=%dms\n", __func__, cache_ms);
@ -1823,41 +1876,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
return -RIG_EINVAL;
}
if (vfo == RIG_VFO_RX)
{
vfo = RIG_VFO_A;
if (VFO_HAS_MAIN_SUB_ONLY) { vfo = RIG_VFO_MAIN; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY) { vfo = RIG_VFO_MAIN; }
}
if (vfo == RIG_VFO_TX)
{
split_t split = 0;
// get split if we can -- it will default to off otherwise
// maybe split/satmode/vfo/freq/mode can be cached for rigs
// that don't have read capability or get_vfo like Icom?
// Icom's lack of get_vfo is problematic in this respect
// If we cache vfo or others than twiddling the rig may cause problems
rig_get_split(rig, vfo, &split);
int satmode = rig->state.cache.satmode;
vfo = RIG_VFO_A;
if (split) { vfo = RIG_VFO_B; }
if (VFO_HAS_MAIN_SUB_ONLY && !split && !satmode) { vfo = RIG_VFO_MAIN; }
if (VFO_HAS_MAIN_SUB_ONLY && (split || satmode)) { vfo = RIG_VFO_SUB; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY && split) { vfo = RIG_VFO_B; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY && satmode) { vfo = RIG_VFO_SUB; }
rig_debug(RIG_DEBUG_TRACE,
"%s: RIG_VFO_TX changed to %s, split=%d, satmode=%d\n", __func__,
rig_strvfo(vfo), split, satmode);
}
vfo = vfo_fixup(rig, vfo);
caps = rig->caps;
@ -2830,6 +2849,9 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
return caps->set_split_freq(rig, vfo, tx_freq);
}
vfo = vfo_fixup(rig, vfo);
/* Assisted mode */
curr_vfo = rig->state.current_vfo;
@ -3381,6 +3403,8 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
return -RIG_ENAVAIL;
}
vfo = vfo_fixup(rig, vfo);
if ((caps->targetable_vfo & RIG_TARGETABLE_PURE)
|| vfo == RIG_VFO_CURR
|| vfo == rig->state.current_vfo)