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

Fix Icom get_ant to use 0x12 without option to ask for specific antenna

pull/193/head
Michael Black 2020-02-05 15:57:56 -06:00
rodzic f9d4755cc0
commit 8958e1419b
1 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5417,7 +5417,8 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, ant_t *ant_curr, value_t *optio
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);
} }
else if (priv_caps->ant_count > 0) { else if (priv_caps->ant_count > 0) {
retval = icom_transaction(rig, C_CTL_ANT, rig_setting2idx(ant), NULL, 0, ackbuf, &ack_len); //retval = icom_transaction(rig, C_CTL_ANT, rig_setting2idx(ant), NULL, 0, ackbuf, &ack_len);
retval = icom_transaction(rig, C_CTL_ANT, -1, NULL, 0, ackbuf, &ack_len);
} }
else { else {
rig_debug(RIG_DEBUG_ERR,"%s: asking for non-current antenna and ant_count==0?\n", __func__); rig_debug(RIG_DEBUG_ERR,"%s: asking for non-current antenna and ant_count==0?\n", __func__);
@ -5434,7 +5435,6 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, ant_t *ant_curr, value_t *optio
// 0x12 0xaa // 0x12 0xaa
// 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
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)