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

Merge branch 'master' of https://github.com/mdblack98/Hamlib into mdblack98-master

pull/156/head
Nate Bargmann 2019-12-06 06:25:58 -06:00
rodzic 60c09ad6b2 be78cc6e31
commit 2d42e3cc1d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: F72625E2EDBED598
2 zmienionych plików z 16 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
icom/icom.c
Wyświetl plik

@ -616,8 +616,8 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
unsigned char freqbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; unsigned char freqbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int freq_len, ack_len = sizeof(ackbuf), retval; int freq_len, ack_len = sizeof(ackbuf), retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s called %s=%"PRIll"\n", __func__, rig_debug(RIG_DEBUG_VERBOSE, "%s called %s=%"PRIfreq"\n", __func__,
rig_strvfo(vfo), (int64_t)freq); rig_strvfo(vfo), freq);
rs = &rig->state; rs = &rig->state;
priv = (struct icom_priv_data *)rs->priv; priv = (struct icom_priv_data *)rs->priv;
@ -2809,8 +2809,15 @@ int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
*/ */
int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo) int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
{ {
struct icom_priv_data *priv;
struct rig_state *rs;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rs = (struct rig_state *)&rig->state;
priv = (struct icom_priv_data *)rs->priv;
if (VFO_HAS_A_B_ONLY) if (VFO_HAS_A_B_ONLY)
{ {
*rx_vfo = RIG_VFO_A; *rx_vfo = RIG_VFO_A;
@ -2827,8 +2834,8 @@ int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
// TBD -- newer rigs we need to find active VFO // TBD -- newer rigs we need to find active VFO
// priv->curvfo if VFOA then A/B response else priv->curvfo=Main Main/Sub response // priv->curvfo if VFOA then A/B response else priv->curvfo=Main Main/Sub response
// For now we return Main/Sub // For now we return Main/Sub
*rx_vfo = RIG_VFO_MAIN; *rx_vfo = priv->rx_vfo;
*tx_vfo = RIG_VFO_SUB; *tx_vfo = priv->tx_vfo;
} }
else else
{ {
@ -3297,10 +3304,11 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
case RIG_SPLIT_ON: case RIG_SPLIT_ON:
split_sc = S_SPLT_ON; split_sc = S_SPLT_ON;
// Need to allow for SATMODE split in here
if (!priv->split_on) // only need to do this if split is not on already if (!priv->split_on) // only need to do this if split is not on already
{ {
/* ensure VFO A is Rx and VFO B is Tx as we assume that elsewhere */ /* ensure VFO A is Rx and VFO B is Tx as we assume that elsewhere */
if (VFO_HAS_A_B_ONLY) if (VFO_HAS_A_B)
{ {
if (RIG_OK != (rc = icom_set_vfo(rig, RIG_VFO_A))) { return rc; } if (RIG_OK != (rc = icom_set_vfo(rig, RIG_VFO_A))) { return rc; }
} }
@ -3323,6 +3331,8 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
return -RIG_ERJCTED; return -RIG_ERJCTED;
} }
priv->rx_vfo = vfo;
priv->tx_vfo = tx_vfo;
priv->split_on = RIG_SPLIT_ON == split; priv->split_on = RIG_SPLIT_ON == split;
return RIG_OK; return RIG_OK;
} }

2
icom/icom.h
Wyświetl plik

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