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

Have icoms check freq to see is power needs to be turned on

pull/155/head
Michael Black 2019-12-18 06:14:31 -06:00
rodzic 67896f1913
commit e24d8f77bd
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 11 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
icom/icom.c
Wyświetl plik

@ -492,11 +492,12 @@ int icom_init(RIG *rig)
struct icom_priv_data *priv; struct icom_priv_data *priv;
const struct icom_priv_caps *priv_caps; const struct icom_priv_caps *priv_caps;
const struct rig_caps *caps; const struct rig_caps *caps;
int retval;
int satmode; int satmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!rig || !rig->caps) if (!rig->caps)
{ {
return -RIG_EINVAL; return -RIG_EINVAL;
} }
@ -535,8 +536,10 @@ int icom_init(RIG *rig)
priv->rx_vfo = RIG_VFO_NONE; priv->rx_vfo = RIG_VFO_NONE;
priv->curr_vfo = RIG_VFO_NONE; priv->curr_vfo = RIG_VFO_NONE;
rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode); rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d\n", __func__, satmode); retval = rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d\n", __func__, satmode);
if (satmode) {
if (retval == RIG_OK && satmode)
{
priv->rx_vfo = RIG_VFO_MAIN; priv->rx_vfo = RIG_VFO_MAIN;
priv->tx_vfo = RIG_VFO_SUB; priv->tx_vfo = RIG_VFO_SUB;
} }
@ -579,13 +582,17 @@ int icom_rig_open(RIG *rig)
unsigned char ackbuf[MAXFRAMELEN]; unsigned char ackbuf[MAXFRAMELEN];
int ack_len = sizeof(ackbuf); int ack_len = sizeof(ackbuf);
int retval = RIG_OK; int retval = RIG_OK;
freq_t freq;
struct rig_state *rs = &rig->state; struct rig_state *rs = &rig->state;
struct icom_priv_data *priv = (struct icom_priv_data *)rs->priv; struct icom_priv_data *priv = (struct icom_priv_data *)rs->priv;
struct icom_priv_caps *priv_caps = (struct icom_priv_caps *) rig->caps->priv; struct icom_priv_caps *priv_caps = (struct icom_priv_caps *) rig->caps->priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_set_powerstat(rig, 1); // if we can't get freq we may need to turn power on
retval = rig_get_freq(vfo, RIG_VFO_CURR, &freq);
if (retval == RIG_ETIMEOUT) { rig_set_powerstat(rig, 1); }
if (priv_caps->serial_USB_echo_check) if (priv_caps->serial_USB_echo_check)
{ {