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

IC-9700 in satmode requesting "S 1 Sub" will now return RIG_OK without 

taking any action
Since satmode is Sub split anyways this makes sense
https://github.com/Hamlib/Hamlib/issues/254
pull/281/head
Michael Black W9MDB 2020-05-20 06:42:06 +02:00
rodzic 9320bfb6ea
commit 9c902dd03b
2 zmienionych plików z 11 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -690,6 +690,8 @@ int icom_get_usb_echo_off(RIG *rig)
retval = icom_transaction(rig, C_RD_FREQ, -1, NULL, 0, ackbuf, &ack_len); retval = icom_transaction(rig, C_RD_FREQ, -1, NULL, 0, ackbuf, &ack_len);
rig_debug(RIG_DEBUG_VERBOSE, "%s: ack_len=%d\n", __func__, ack_len);
if (retval == RIG_OK) if (retval == RIG_OK)
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo on detected\n", rig_debug(RIG_DEBUG_VERBOSE, "%s: USB echo on detected\n",
@ -4666,6 +4668,13 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
priv->satmode = 0; priv->satmode = 0;
priv->tx_vfo = RIG_VFO_B; priv->tx_vfo = RIG_VFO_B;
} }
else if (tx_vfo == RIG_VFO_SUB && priv->satmode && split==1)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: rig in satmode so setting split on is redundant and will create error...returning OK\n", __func__);
// we'll return OK anyways as this is a split mode
// and gpredict wants to see the OK response here
return RIG_OK; // we'll return OK anyways as this is a split mode
}
switch (split) switch (split)
{ {
@ -4741,7 +4750,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
priv->tx_vfo = RIG_VFO_SUB; priv->tx_vfo = RIG_VFO_SUB;
priv->rx_vfo = RIG_VFO_MAIN; priv->rx_vfo = RIG_VFO_MAIN;
rig_debug(RIG_DEBUG_TRACE, rig_debug(RIG_DEBUG_TRACE,
"%s: tx=%s, rx=%s because tx_vfo=%s, changing tx_vfo to Main\n", __func__, "%s: tx=%s, rx=%s because tx_vfo=%s\n", __func__,
rig_strvfo(priv->tx_vfo), rig_strvfo(priv->rx_vfo), rig_strvfo(tx_vfo)); rig_strvfo(priv->tx_vfo), rig_strvfo(priv->rx_vfo), rig_strvfo(tx_vfo));
tx_vfo = RIG_VFO_SUB; tx_vfo = RIG_VFO_SUB;

2
rigs/icom/icom.h
Wyświetl plik

@ -31,7 +31,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#define BACKEND_VER "20200517" #define BACKEND_VER "20200519"
/* /*
* defines used by comp_cal_str in rig.c * defines used by comp_cal_str in rig.c