Add VFO None for available VFOS

pull/224/head
Michael Black 2020-03-15 09:52:47 -05:00
rodzic 4e606a054f
commit ed4b77726a
2 zmienionych plików z 3 dodań i 13 usunięć

Wyświetl plik

@ -462,7 +462,7 @@ static struct
{ RIG_VFO_SUB, "Sub" },
{ RIG_VFO_SUB_A, "SubA" },
{ RIG_VFO_SUB_B, "SubB" },
{ RIG_VFO_NONE, "" },
{ RIG_VFO_NONE, "None" },
};
@ -502,14 +502,9 @@ const char *HAMLIB_API rig_strvfo(vfo_t vfo)
{
int i;
//a git too verbose
//a bit too verbose
//rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
if (vfo == RIG_VFO_NONE)
{
return "";
}
for (i = 0 ; vfo_str[i].str[0] != '\0'; i++)
{
if (vfo == vfo_str[i].vfo)
@ -950,11 +945,6 @@ const char *HAMLIB_API rig_strvfop(vfo_op_t op)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (op == RIG_OP_NONE)
{
return "";
}
for (i = 0; vfo_op_str[i].str[0] != '\0'; i++)
{
if (op == vfo_op_str[i].vfo_op)

Wyświetl plik

@ -57,7 +57,7 @@ int sprintf_vfo(char *str, vfo_t vfo)
const char *sv;
sv = rig_strvfo(vfo & RIG_VFO_N(i));
if (sv && sv[0])
if (sv && sv[0] && strstr(str,"None")==0)
{
len += sprintf(str + len, "%s ", sv);
}