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

Improve kenwood set_rit to use the difference requested instead of restarting at zero 

https://github.com/Hamlib/Hamlib/issues/677
pull/691/head
Mike Black W9MDB 2021-04-26 11:32:55 -05:00
rodzic b0323be6b7
commit a281161fcf
1 zmienionych plików z 17 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1734,6 +1734,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
int diff; int diff;
int rit_enabled; int rit_enabled;
int xit_enabled; int xit_enabled;
shortfreq_t curr_rit;
struct kenwood_priv_data *priv = rig->state.priv; struct kenwood_priv_data *priv = rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called: vfo=%s, rit=%ld\n", rig_debug(RIG_DEBUG_VERBOSE, "%s called: vfo=%s, rit=%ld\n",
@ -1768,31 +1769,40 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
} }
} }
// zero out rit // by getting current rit we can determine how to handle change
// we might be able to read rit and just do the difference // we just use curr_rit - rit to determine how far we need to move
// see if anybody ever wants that or complain about this being slow // No need to zero out rit
retval = kenwood_get_rit(rig,RIG_VFO_CURR,&curr_rit);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
#if 0 // no longer needed if diff can be done
retval = kenwood_transaction(rig, "RC", NULL, 0); retval = kenwood_transaction(rig, "RC", NULL, 0);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
RETURNFUNC(retval); RETURNFUNC(retval);
} }
#endif
if (rit == 0) if (rit == 0 && curr_rit == 0)
{ {
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }
if (priv->has_rit2) if (priv->has_rit2)
{ {
snprintf(buf, sizeof(buf), "R%c%05d", (rit > 0) ? 'U' : 'D', abs((int) rit)); diff = curr_rit - rit;
rig_debug(RIG_DEBUG_TRACE, "%s: rit=%ld, curr_rit=%ld, diff=%d\n", __func__, rit, curr_rit, diff);
snprintf(buf, sizeof(buf), "R%c%05d", (diff > 0) ? 'U' : 'D', abs((int) diff));
retval = kenwood_transaction(rig, buf, NULL, 0); retval = kenwood_transaction(rig, buf, NULL, 0);
} }
else else
{ {
snprintf(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D'); snprintf(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D');
diff = labs(((curr_rit - rit) + (curr_rit - rit) >= 0 ? 5 : -5) / 10); // round to nearest 10Hz
diff = labs((rit + rit >= 0 ? 5 : -5) / 10); // round to nearest rig_debug(RIG_DEBUG_TRACE, "%s: rit=%ld, curr_rit=%ld, diff=%d\n", __func__, rit, curr_rit, diff);
rig_debug(RIG_DEBUG_TRACE, "%s: rit change loop=%d\n", __func__, diff); rig_debug(RIG_DEBUG_TRACE, "%s: rit change loop=%d\n", __func__, diff);
for (i = 0; i < diff; i++) for (i = 0; i < diff; i++)