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

IC-910 (and hopefully IC-9700) now working with gpredict in both simplex non-satmode and full duplex satmode 

As of 20200514 switching to satmode will automically switch rig to satmode
But switching back to simple requires manually going back to split mode until gpredict provide the correct split mode request of "S 1 VFOB" or "S 1 VFOA"
https://github.com/Hamlib/Hamlib/issues/237
pull/252/head
Michael Black W9MDB 2020-05-14 12:15:37 -04:00
rodzic 9c4dfbc34c
commit 156db580f8
2 zmienionych plików z 33 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3788,13 +3788,18 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
rs = &rig->state;
priv = (struct icom_priv_data *) rs->priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d, subvfo=%s\n", __func__, priv->satmode, rig_strvfo(priv->tx_vfo));
if (RIG_VFO_TX) {
if (priv->satmode) vfo = RIG_VFO_SUB;
else vfo = priv->tx_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d, subvfo=%s\n", __func__,
priv->satmode, rig_strvfo(priv->tx_vfo));
if (RIG_VFO_TX)
{
if (priv->satmode) { vfo = RIG_VFO_SUB; }
else { vfo = priv->tx_vfo; }
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo is now %s\n", __func__, rig_strvfo(vfo));
if (priv->satmode && vfo == RIG_VFO_TX) vfo = RIG_VFO_SUB;
if (priv->satmode && vfo == RIG_VFO_TX) { vfo = RIG_VFO_SUB; }
if (priv->curr_vfo == RIG_VFO_NONE)
{
@ -4622,6 +4627,24 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
vfo = priv->curr_vfo;
}
// This should automaticaly switch between satmode on/off based on the requested split vfo
if (tx_vfo == RIG_VFO_SUB && !priv->satmode)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: VFO_SUB and satmode is off so turning on\n",
__func__);
rig_set_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, 1);
priv->satmode = 1;
priv->tx_vfo = RIG_VFO_SUB;
}
else if ((tx_vfo == RIG_VFO_B && priv->satmode) || (tx_vfo == RIG_VFO_A && priv->satmode))
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: VFO_B and satmode is on so turning off\n",
__func__);
rig_set_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, 0);
priv->satmode = 0;
priv->tx_vfo = RIG_VFO_B;
}
switch (split)
{
case RIG_SPLIT_OFF:
@ -4689,15 +4712,15 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
}
else if (VFO_HAS_MAIN_SUB_A_B_ONLY && (tx_vfo == RIG_VFO_MAIN
|| tx_vfo == RIG_VFO_SUB))
{
{ // do we need another case for tx_vfo = A/B ?
rig_debug(RIG_DEBUG_TRACE, "%s: vfo clause 3\n", __func__);
// if we're asking for split in this case we split Main on A/B
priv->tx_vfo = RIG_VFO_B;
priv->rx_vfo = RIG_VFO_A;
priv->tx_vfo = RIG_VFO_SUB;
priv->rx_vfo = RIG_VFO_MAIN;
rig_debug(RIG_DEBUG_TRACE,
"%s: tx=%s, rx=%s because tx_vfo=%s, changing tx_vfo to Main\n", __func__,
rig_strvfo(priv->tx_vfo), rig_strvfo(priv->rx_vfo), rig_strvfo(tx_vfo));
tx_vfo = RIG_VFO_B;
tx_vfo = RIG_VFO_SUB;
#if 0 // is this needed for satmode?

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

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