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

ft817.c: Use ft817_get_ptt instead of open coding it.

pull/799/head
Wouter van Gulik 2021-09-08 21:36:24 +02:00
rodzic 34492271bc
commit 90f27ac7aa
1 zmienionych plików z 11 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
rigs/yaesu/ft817.c
Wyświetl plik

@ -951,22 +951,26 @@ static int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
static int ft817_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo) static int ft817_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
{ {
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv; struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
ptt_t ptt;
int n; int n;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
if (check_cache_timeout(&p->tx_status_tv)) n = ft817_get_ptt(rig, 0, &ptt);
if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_TX_STATUS)) < 0) if (n != RIG_OK)
{ {
return n; return n;
} }
if (p->tx_status & 0x80) /* Check if rig is in TX mode */
if (ptt == RIG_PTT_OFF)
{ {
// TX status not valid when in RX // TX status not valid when in RX
unsigned char c; unsigned char c;
if ((n = ft817_read_eeprom(rig, 0x007a, &c)) < 0) /* get split status */ /* Get split status from EEPROM */
n = ft817_read_eeprom(rig, 0x7a, &c);
if (n != RIG_OK)
{ {
return n; return n;
} }