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

Update some more items in icom.c where appropriate

pull/281/head
Michael Black W9MDB 2020-05-25 09:11:32 -05:00
rodzic a8fdcc146a
commit 281022447c
2 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -4685,7 +4685,8 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: tx_vfo=%s\n", __func__, rig_debug(RIG_DEBUG_TRACE, "%s: tx_vfo=%s\n", __func__,
rig_strvfo(tx_vfo)); rig_strvfo(tx_vfo));
//vfo_final = RIG_VFO_A; priv->tx_vfo = RIG_VFO_A;
//vfo_final = RIG_VFO_A; // do we need to switch back at all?
} }
// otherwise if Main or Sub we set Main or VFOA as the current vfo // otherwise if Main or Sub we set Main or VFOA as the current vfo
else if (tx_vfo == RIG_VFO_MAIN || tx_vfo == RIG_VFO_SUB) else if (tx_vfo == RIG_VFO_MAIN || tx_vfo == RIG_VFO_SUB)
@ -4694,7 +4695,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
__func__, rig_strvfo(tx_vfo)); __func__, rig_strvfo(tx_vfo));
//rig_set_vfo(rig, RIG_VFO_MAIN); //rig_set_vfo(rig, RIG_VFO_MAIN);
//vfo_final = RIG_VFO_MAIN; //vfo_final = RIG_VFO_MAIN; // do we need to switch back at all?
if (VFO_HAS_A_B_ONLY) if (VFO_HAS_A_B_ONLY)
{ {
@ -4726,7 +4727,8 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
if (vfo == RIG_VFO_MAIN) { vfo = RIG_VFO_A; } if (vfo == RIG_VFO_MAIN) { vfo = RIG_VFO_A; }
else if (vfo == RIG_VFO_SUB) { vfo = RIG_VFO_B; } else if (vfo == RIG_VFO_SUB) { vfo = RIG_VFO_B; }
//vfo_final = RIG_VFO_A; priv->tx_vfo = tx_vfo;
//vfo_final = RIG_VFO_A; // do we need to switch back at all?
} }
/* 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 */
@ -4922,6 +4924,7 @@ int icom_mem_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split,
if (rig->state.current_vfo != RIG_VFO_MEM || if (rig->state.current_vfo != RIG_VFO_MEM ||
!rig_has_vfo_op(rig, RIG_OP_XCHG)) !rig_has_vfo_op(rig, RIG_OP_XCHG))
{ {
*split = rig->state.cache.split; // we set this but still return ENAVAIL
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
} }

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 "20200524" #define BACKEND_VER "20200525"
/* /*
* defines used by comp_cal_str in rig.c * defines used by comp_cal_str in rig.c