kopia lustrzana https://github.com/Hamlib/Hamlib
Speed up rig_band_changed actions for FT991 and perhaps others
Putting the AC001; command immediately after FA freq change make the band change end state occur immediatelypull/1481/head
rodzic
d6689145a0
commit
4d568c782e
24
src/rig.c
24
src/rig.c
|
@ -1977,6 +1977,7 @@ int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||||
vfo_t vfo_save;
|
vfo_t vfo_save;
|
||||||
static int last_band = -1;
|
static int last_band = -1;
|
||||||
int curr_band;
|
int curr_band;
|
||||||
|
int band_changing = 0;
|
||||||
|
|
||||||
if (CHECK_RIG_ARG(rig))
|
if (CHECK_RIG_ARG(rig))
|
||||||
{
|
{
|
||||||
|
@ -1990,7 +1991,8 @@ int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||||
{
|
{
|
||||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: band changing to %s\n", __func__,
|
rig_debug(RIG_DEBUG_VERBOSE, "%s: band changing to %s\n", __func__,
|
||||||
rig_get_band_str(rig, curr_band, 0));
|
rig_get_band_str(rig, curr_band, 0));
|
||||||
rig_band_changed(rig, curr_band);
|
band_changing = 1;
|
||||||
|
//rig_band_changed(rig, curr_band);
|
||||||
last_band = curr_band;
|
last_band = curr_band;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2117,8 +2119,13 @@ int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
HAMLIB_TRACE;
|
|
||||||
retcode = caps->set_freq(rig, vfo, freq);
|
retcode = caps->set_freq(rig, vfo, freq);
|
||||||
|
|
||||||
|
if (band_changing)
|
||||||
|
{
|
||||||
|
rig_band_changed(rig, curr_band);
|
||||||
|
}
|
||||||
|
|
||||||
// disabling the freq check as of 2023-06-02
|
// disabling the freq check as of 2023-06-02
|
||||||
// seems unnecessary and slows down rigs unnecessarily
|
// seems unnecessary and slows down rigs unnecessarily
|
||||||
tfreq = freq;
|
tfreq = freq;
|
||||||
|
@ -2207,6 +2214,9 @@ int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||||
}
|
}
|
||||||
|
|
||||||
HAMLIB_TRACE;
|
HAMLIB_TRACE;
|
||||||
|
|
||||||
|
if (band_changing) { rig_band_changed(rig, curr_band); }
|
||||||
|
|
||||||
retcode = caps->set_freq(rig, vfo, freq);
|
retcode = caps->set_freq(rig, vfo, freq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4521,10 +4531,8 @@ int HAMLIB_API rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
|
||||||
{
|
{
|
||||||
tx_vfo = rig->state.tx_vfo;
|
tx_vfo = rig->state.tx_vfo;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
tx_vfo = vfo_fixup(rig, tx_vfo, rig->state.cache.split);
|
||||||
tx_vfo = vfo_fixup(rig, vfo, rig->state.cache.split);
|
|
||||||
}
|
|
||||||
|
|
||||||
rig_get_freq(rig, tx_vfo, &tfreq);
|
rig_get_freq(rig, tx_vfo, &tfreq);
|
||||||
|
|
||||||
|
@ -8656,12 +8664,16 @@ HAMLIB_EXPORT(void *) rig_data_pointer(RIG *rig, rig_ptrx_t idx)
|
||||||
{
|
{
|
||||||
case RIG_PTRX_RIGPORT:
|
case RIG_PTRX_RIGPORT:
|
||||||
return RIGPORT(rig);
|
return RIGPORT(rig);
|
||||||
|
|
||||||
case RIG_PTRX_PTTPORT:
|
case RIG_PTRX_PTTPORT:
|
||||||
return PTTPORT(rig);
|
return PTTPORT(rig);
|
||||||
|
|
||||||
case RIG_PTRX_DCDPORT:
|
case RIG_PTRX_DCDPORT:
|
||||||
return DCDPORT(rig);
|
return DCDPORT(rig);
|
||||||
|
|
||||||
case RIG_PTRX_CACHE:
|
case RIG_PTRX_CACHE:
|
||||||
return CACHE(rig);
|
return CACHE(rig);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data index=%d\n", __func__, idx);
|
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data index=%d\n", __func__, idx);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Ładowanie…
Reference in New Issue