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

Add verification of set_ptt with get_ptt

pull/572/head^2
Michael Black W9MDB 2021-02-24 22:39:45 -06:00
rodzic a1f5085f4c
commit 7eb50d0d97
1 zmienionych plików z 18 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
src/rig.c
Wyświetl plik

@ -2485,8 +2485,15 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
|| vfo == RIG_VFO_CURR || vfo == RIG_VFO_CURR
|| vfo == rig->state.current_vfo) || vfo == rig->state.current_vfo)
{ {
int retry = 3;
ptt_t tptt;
do
{
retcode = caps->set_ptt(rig, vfo, ptt); retcode = caps->set_ptt(rig, vfo, ptt);
if (retcode != RIG_OK) RETURNFUNC(retcode);
retcode = rig_get_ptt(rig, vfo, &tptt);
if (tptt != ptt) rig_debug(RIG_DEBUG_WARN, "%s: failed, retry=%d\n", __func__, retry);
} while(tptt != ptt && retry-- > 0 && retcode == RIG_OK);
} }
else else
{ {
@ -2503,7 +2510,15 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
if (retcode == RIG_OK) if (retcode == RIG_OK)
{ {
int rc2; int rc2;
int retry = 3;
ptt_t tptt;
do
{
retcode = caps->set_ptt(rig, vfo, ptt); retcode = caps->set_ptt(rig, vfo, ptt);
if (retcode != RIG_OK) RETURNFUNC(retcode);
retcode = rig_get_ptt(rig, vfo, &tptt);
if (tptt != ptt) rig_debug(RIG_DEBUG_WARN, "%s: failed, retry=%d\n", __func__, retry);
} while(tptt != ptt && retry-- > 0 && retcode == RIG_OK);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); rc2 = caps->set_vfo(rig, curr_vfo);