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

Add rules for setting VFO_RX and VFO_TX for different rig types 

https://github.com/Hamlib/Hamlib/issues/261
pull/281/head
Michael Black W9MDB 2020-05-24 23:42:35 -05:00
rodzic 48692b4bc9
commit 1add89bd71
4 zmienionych plików z 55 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
include/hamlib/rig.h
Wyświetl plik

@ -1930,6 +1930,7 @@ struct rig_cache {
struct timespec time_split;
vfo_t vfo_freq; // last vfo cached
vfo_t vfo_mode; // last vfo cached
int satmode; // if rig is in satellite mode
};
@ -2009,6 +2010,7 @@ struct rig_state {
time_t twiddle_time; /*!< time when vfo twiddling was detected */
int twiddle_timeout; /*!< timeout to resume from twiddling */
struct rig_cache cache;
int vfo_opt; /*!< Is -o switch turned on? */
};
//! @cond Doxygen_Suppress

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

@ -757,7 +757,7 @@ icom_rig_open(RIG *rig)
}
retval = rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
priv->satmode = satmode;
rig->state.cache.satmode = satmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d\n", __func__, satmode);
// RIG_OK return means this rig has satmode capabiltiy and Main/Sub VFOs
@ -1159,7 +1159,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
vfo = RIG_VFO_A;
if (priv->split_on) { vfo = RIG_VFO_B; }
else if (priv->satmode) { vfo = RIG_VFO_SUB; }
else if (rig->state.cache.satmode) { vfo = RIG_VFO_SUB; }
}
rig_debug(RIG_DEBUG_TRACE, "%s: VFO_TX requested, new vfo=%s\n", __func__,
@ -1960,7 +1960,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
__func__, rig_strvfo(vfo));
}
else if ((vfo == RIG_VFO_SUB) && (VFO_HAS_A_B_ONLY
|| (VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !priv->satmode)))
|| (VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !rig->state.cache.satmode)))
{
// if rig doesn't have Main/Sub
// or if rig has both Main/Sub and A/B -- e.g. 9700
@ -1971,6 +1971,13 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
"%s: Rig does not have MAIN/SUB so Sub changed to %s\n",
__func__, rig_strvfo(vfo));
}
else if (vfo == RIG_VFO_TX)
{
vfo = RIG_VFO_A;
if (VFO_HAS_A_B_ONLY && rig->state.cache.satmode) vfo = RIG_VFO_B;
else if (VFO_HAS_MAIN_SUB_ONLY) vfo = RIG_VFO_SUB;
else if (VFO_HAS_MAIN_SUB_A_B_ONLY && rig->state.cache.satmode) vfo = RIG_VFO_SUB;
}
if ((vfo == RIG_VFO_A || vfo == RIG_VFO_B) && !VFO_HAS_A_B && VFO_HAS_MAIN_SUB)
{
@ -2018,7 +2025,7 @@ rig_debug(RIG_DEBUG_TRACE,"%s: debug#2\n", __func__);
if (VFO_HAS_MAIN_SUB_A_B_ONLY && priv->split_on) { icvfo = S_VFOB; }
// If not split or satmode then we must want VFOB
if (VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !priv->satmode) { icvfo = S_VFOB; }
if (VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !rig->state.cache.satmode) { icvfo = S_VFOB; }
rig_debug(RIG_DEBUG_TRACE, "%s: Sub asked for, ended up with vfo=%s\n",
__func__, icvfo == S_SUB ? "Sub" : "VFOB");
@ -3713,7 +3720,7 @@ int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
/*
* Helper function to go back and forth split VFO
*/
int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
int icom_get_split_vfos(RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
{
struct icom_priv_data *priv;
struct rig_state *rs;
@ -3751,7 +3758,7 @@ int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo)
// e.g. IC9700 split on Main/Sub does not work
// only Main VFOA/B and SubRx/MainTx split works
rig_get_func((RIG *)rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
priv->satmode = satmode;
rig->state.cache.satmode = satmode;
// don't care about retval here...only care about satmode=1
if (satmode)
@ -3805,17 +3812,17 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
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));
rig->state.cache.satmode, rig_strvfo(priv->tx_vfo));
if (RIG_VFO_TX)
{
if (priv->satmode) { vfo = RIG_VFO_SUB; }
if (rig->state.cache.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 (rig->state.cache.satmode && vfo == RIG_VFO_TX) { vfo = RIG_VFO_SUB; }
if (priv->curr_vfo == RIG_VFO_NONE)
{
@ -3845,7 +3852,7 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
int satmode = 0;
// retval not important here...only satmode=1 means anything
rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
priv->satmode = satmode;
rig->state.cache.satmode = satmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d\n", __func__, satmode);
if (satmode == 0) // only worth trying if not in satmode
@ -4040,7 +4047,7 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
int satmode = 0;
// don't care about the retval here..only satmode=1 is important
rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
priv->satmode = satmode;
rig->state.cache.satmode = satmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s: satmode=%d\n", __func__, satmode);
if (satmode == 0) // only worth trying if not in satmode
@ -4644,24 +4651,24 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
}
// This should automaticaly switch between satmode on/off based on the requested split vfo
if (tx_vfo == RIG_VFO_SUB && !priv->satmode)
if (tx_vfo == RIG_VFO_SUB && !rig->state.cache.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;
rig->state.cache.satmode = 1;
priv->tx_vfo = RIG_VFO_SUB;
}
else if ((tx_vfo == RIG_VFO_B && priv->satmode) || (tx_vfo == RIG_VFO_A
&& priv->satmode))
else if ((tx_vfo == RIG_VFO_B && rig->state.cache.satmode) || (tx_vfo == RIG_VFO_A
&& rig->state.cache.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;
rig->state.cache.satmode = 0;
priv->tx_vfo = RIG_VFO_B;
}
else if (tx_vfo == RIG_VFO_SUB && priv->satmode && split==1)
else if (tx_vfo == RIG_VFO_SUB && rig->state.cache.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
@ -4884,7 +4891,7 @@ int icom_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
}
rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_SATMODE, &satmode);
priv->satmode = satmode;
rig->state.cache.satmode = satmode;
priv->split_on = RIG_SPLIT_ON == *split;
@ -5235,7 +5242,7 @@ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
priv->x25cmdfails = 0; // we reset this to try it again
priv->x1cx03cmdfails = 0; // we reset this to try it again
priv->satmode = status;
rig->state.cache.satmode = status;
break;
@ -7113,7 +7120,7 @@ static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo)
// only need to set vfo if it's changed
else if (priv->curr_vfo != vfo)
{
if (!(VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !priv->satmode && vfo == RIG_VFO_SUB && priv->curr_vfo == RIG_VFO_B)) {
if (!(VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !rig->state.cache.satmode && vfo == RIG_VFO_SUB && priv->curr_vfo == RIG_VFO_B)) {
rig_debug(RIG_DEBUG_TRACE, "%s: setting new vfo=%s\n", __func__,
rig_strvfo(vfo));
retval = rig_set_vfo(rig, vfo);

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

@ -31,7 +31,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "20200519"
#define BACKEND_VER "20200524"
/*
* defines used by comp_cal_str in rig.c
@ -191,7 +191,6 @@ struct icom_priv_data
freq_t vfob_freq; // track last setting of vfob -- used to return last freq when ptt is asserted
int x25cmdfails; // This will get set if the 0x25 command fails so we try just once
int x1cx03cmdfails; // This will get set if the 0x1c 0x03 command fails so we try just once
int satmode; // Remember satmode for handling TX/RX VFOs and such
};
extern const struct ts_sc_list r8500_ts_sc_list[];
@ -296,7 +295,7 @@ int icom_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq,
int icom_send_morse(RIG *rig, vfo_t vfo, const char *msg);
int icom_send_voice_mem(RIG *rig, vfo_t vfo, int bank);
/* Exposed routines */
int icom_get_split_vfos(const RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo);
int icom_get_split_vfos(RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo);
int icom_set_raw(RIG *rig, int cmd, int subcmd, int subcmdbuflen,
unsigned char *subcmdbuf, int val_bytes, int val);
int icom_get_raw_buf(RIG *rig, int cmd, int subcmd, int subcmdbuflen,

26
src/rig.c
Wyświetl plik

@ -1214,7 +1214,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
const struct rig_caps *caps;
int retcode;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo));
if (CHECK_RIG_ARG(rig))
{
@ -1362,8 +1362,9 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
return -RIG_ENAVAIL;
}
// If we're in vfo_mode then rigctld will do any VFO swapping we need
if ((caps->targetable_vfo & RIG_TARGETABLE_FREQ)
|| vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
|| vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo || rig->state.vfo_opt == 1)
{
retcode = caps->get_freq(rig, vfo, freq);
@ -1811,6 +1812,24 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
rig_debug(RIG_DEBUG_ERR, "%s: rig does not have %s\n", __func__, rig_strvfo(vfo));
return -RIG_EINVAL;
}
if (vfo == RIG_VFO_RX)
{
vfo = RIG_VFO_A;
if (VFO_HAS_MAIN_SUB_ONLY) vfo = RIG_VFO_MAIN;
if (VFO_HAS_MAIN_SUB_A_B_ONLY) vfo = RIG_VFO_MAIN;
}
if (vfo == RIG_VFO_TX)
{
int split = rig->state.cache.split;
int satmode = rig->state.cache.satmode;
vfo = RIG_VFO_A;
if (split) vfo = RIG_VFO_B;
if (VFO_HAS_MAIN_SUB_ONLY && !split && !satmode) vfo = RIG_VFO_MAIN;
if (VFO_HAS_MAIN_SUB_ONLY && (split || satmode)) vfo = RIG_VFO_SUB;
if (VFO_HAS_MAIN_SUB_A_B_ONLY && split) vfo = RIG_VFO_B;
if (VFO_HAS_MAIN_SUB_A_B_ONLY && satmode) vfo = RIG_VFO_SUB;
rig_debug(RIG_DEBUG_TRACE, "%s: RIG_VFO_TX changed to %s, split=%d, satmode=%d\n", __func__, rig_strvfo(vfo), split, satmode);
}
caps = rig->caps;
@ -3336,6 +3355,9 @@ int HAMLIB_API rig_set_split_vfo(RIG *rig,
rig->state.tx_vfo = tx_vfo;
}
rig->state.cache.split = split;
rig->state.cache.split_vfo = tx_vfo;
elapsed_ms(&rig->state.cache.time_split, ELAPSED_SET);
return retcode;
}