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

Remove caps->get_ptt from DTR/RTS get_ptt -- seems we should not need query via CAT when using DTR/RTS 

https://github.com/Hamlib/Hamlib/issues/1241
pull/1242/head
Mike Black W9MDB 2023-03-04 11:17:14 -06:00
rodzic fe1eabf531
commit decc056662
1 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/rig.c
Wyświetl plik

@ -3451,6 +3451,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
RETURNFUNC(retcode); RETURNFUNC(retcode);
case RIG_PTT_SERIAL_RTS: case RIG_PTT_SERIAL_RTS:
#if 0 // do not use caps->get_ptt https://github.com/Hamlib/Hamlib/issues/1241
if (caps->get_ptt) if (caps->get_ptt)
{ {
HAMLIB_TRACE; HAMLIB_TRACE;
@ -3465,11 +3466,11 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
ELAPSED2; ELAPSED2;
RETURNFUNC(retcode); RETURNFUNC(retcode);
} }
#endif
if (strcmp(rs->pttport.pathname, rs->rigport.pathname) if (strcmp(rs->pttport.pathname, rs->rigport.pathname)
&& rs->pttport.fd < 0) && rs->pttport.fd < 0)
{ {
/* port is closed so assume PTT off */ /* port is closed so assume PTT off */
*ptt = RIG_PTT_OFF; *ptt = RIG_PTT_OFF;
} }
@ -3485,6 +3486,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
RETURNFUNC(retcode); RETURNFUNC(retcode);
case RIG_PTT_SERIAL_DTR: case RIG_PTT_SERIAL_DTR:
#if 0 // do not use caps->get_ptt https://github.com/Hamlib/Hamlib/issues/1241
if (caps->get_ptt) if (caps->get_ptt)
{ {
HAMLIB_TRACE; HAMLIB_TRACE;
@ -3499,11 +3501,11 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
ELAPSED2; ELAPSED2;
RETURNFUNC(retcode); RETURNFUNC(retcode);
} }
#endif
if (strcmp(rs->pttport.pathname, rs->rigport.pathname) if (strcmp(rs->pttport.pathname, rs->rigport.pathname)
&& rs->pttport.fd < 0) && rs->pttport.fd < 0)
{ {
/* port is closed so assume PTT off */ /* port is closed so assume PTT off */
*ptt = RIG_PTT_OFF; *ptt = RIG_PTT_OFF;
} }