Ensure FTDX3000/5000 return ENAVAIL if tuner is on and meter is not SWR

pull/891/head
Mike Black W9MDB 2021-12-16 15:50:25 -06:00
rodzic 39d9577c1c
commit c901126bf6
1 zmienionych plików z 8 dodań i 4 usunięć

Wyświetl plik

@ -4599,10 +4599,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
newcat_get_func(rig, RIG_VFO_A, RIG_FUNC_TUNER, &tuner);
newcat_get_level(rig, RIG_VFO_A, RIG_LEVEL_METER, &meter);
if (meter.i == RIG_METER_SWR)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM%c%c", (tuner
&& meter.i == RIG_METER_SWR) ? '2' : '6',
cat_term);
if (tuner && meter.i != RIG_METER_SWR)
{
RETURNFUNC(-RIG_ENAVAIL); // if meter not SWR can't read SWR
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM%c%c", (tuner
&& meter.i == RIG_METER_SWR) ? '2' : '6',
cat_term);
}
else
{