Rigs like IC9700 with MainA/B will have VFOA/Main mapped to MainA and VFOB/Sub mapped to MainB

No known use for SubA/SubB yet
https://github.com/Hamlib/Hamlib/issues/621
pull/649/head
Michael Black W9MDB 2021-03-19 23:36:33 -05:00
rodzic 1224e9f6ba
commit 950163f1a4
2 zmienionych plików z 13 dodań i 2 usunięć

Wyświetl plik

@ -2098,7 +2098,17 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
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)
else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_MAIN_SUB_A_B_ONLY)
{
// If we're being asked for A/Main but we are a MainA/MainB rig change it
vfo = RIG_VFO_MAIN_A;
}
else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_MAIN_SUB_A_B_ONLY)
{
// If we're being asked for B/Sub but we are a MainA/MainB rig change it
vfo = RIG_VFO_MAIN_B;
}
else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_B) && !VFO_HAS_A_B && VFO_HAS_MAIN_SUB)
{
// If we're being asked for A/B but we are a Main/Sub rig change it
vfo_t vfo_old = vfo;
@ -2108,6 +2118,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
rig_strvfo(vfo));
}
if ((vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB) && !VFO_HAS_MAIN_SUB)
{
rig_debug(RIG_DEBUG_ERR, "%s: Rig does not have VFO Main/Sub?\n",

Wyświetl plik

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