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

Change ic785x priv_caps to non-const as we are putting in some dynamic caps now 

Will have to change all other icom rigs too
pull/193/head
Michael Black 2020-01-28 08:20:41 -06:00
rodzic 6edc9e003b
commit 2e41b8e030
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
rigs/icom/icom.c
Wyświetl plik

@ -5409,7 +5409,9 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t *ant, value_t *option)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
retval = icom_transaction(rig, C_CTL_ANT, -1, NULL, 0, ackbuf, &ack_len); retval = icom_transaction(rig, C_CTL_ANT, -1, NULL, 0, ackbuf, &ack_len);
if (retval != RIG_OK) { if (retval != RIG_OK)
{
return retval;
} }
// ack_len should be either 2 or 3 // ack_len should be either 2 or 3
@ -5418,11 +5420,7 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t *ant, value_t *option)
// 0x12 0xaa 0xrr // 0x12 0xaa 0xrr
// Where aa is a zero-base antenna number and rr is a binary for rx only // Where aa is a zero-base antenna number and rr is a binary for rx only
priv_caps->antack_len = ack_len; // remember this for set_ant priv_caps->antack_len = ack_len; // remember this for set_ant
rig_debug(RIG_DEBUG_VERBOSE,"%s: debug#2\n",__func__)
if (retval != RIG_OK)
{
return retval;
}
if ((ack_len != 2 && ack_len != 3) || ackbuf[0] != C_CTL_ANT || if ((ack_len != 2 && ack_len != 3) || ackbuf[0] != C_CTL_ANT ||
ackbuf[1] > 3) ackbuf[1] > 3)
@ -5432,12 +5430,14 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t *ant, value_t *option)
return -RIG_ERJCTED; return -RIG_ERJCTED;
} }
rig_debug(RIG_DEBUG_VERBOSE,"%s: debug#3\n",__func__)
*ant = RIG_ANT_N(ackbuf[1]); *ant = RIG_ANT_N(ackbuf[1]);
/* Note: with IC756/IC-756Pro/IC-7800 and more, ackbuf[2] deals with [RX ANT] */ // Note: with IC756/IC-756Pro/IC-7800 and more, ackbuf[2] deals with [RX ANT]
// Hopefully any ack_len=3 can fit in the option field
if (ack_len == 3) if (ack_len == 3)
{ {
option->i = ackbuf[1]; option->i = ackbuf[2];
} }
return RIG_OK; return RIG_OK;