Move Yaesu special_60m handling to cover any newcat_get_freq request

get_freq with 60M freq will not attempt freq change on certain rigs as they have to use MEM mode to select 60m.  But RIG_OK will be returned.
pull/518/head
Michael Black W9MDB 2021-01-21 06:45:50 -06:00
rodzic 20d5bc0b9e
commit 4df4820ad9
1 zmienionych plików z 7 dodań i 11 usunięć

Wyświetl plik

@ -745,6 +745,13 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
if (special_60m && (freq >= 5300000 && freq <= 5410000))
{
rig_debug(RIG_DEBUG_TRACE, "%s: 60M VFO_MEM exception, no freq change done\n",
__func__);
RETURNFUNC(RIG_OK); /* make it look like we changed */
}
switch (vfo)
{
case RIG_VFO_A:
@ -757,17 +764,6 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
c = 'B';
break;
case RIG_VFO_MEM:
if (special_60m && (freq >= 5300000 && freq <= 5410000))
{
rig_debug(RIG_DEBUG_TRACE, "%s: 60M VFO_MEM exception, no freq change done\n",
__func__);
RETURNFUNC(RIG_OK); /* make it look like we changed */
}
c = 'A';
break;
default:
RETURNFUNC(-RIG_ENIMPL); /* Only VFO_A or VFO_B are valid */
}