kopia lustrzana https://github.com/Hamlib/Hamlib
astyle newcat.c
rodzic
57f6c863c6
commit
aaab26686a
|
@ -3811,7 +3811,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
|
|
||||||
fpf = newcat_scale_float(255, val.f);
|
fpf = newcat_scale_float(255, val.f);
|
||||||
|
|
||||||
if (is_ftdx10 || is_ft710) main_sub_vfo = 0;
|
if (is_ftdx10 || is_ft710) { main_sub_vfo = 0; }
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AG%c%03d%c", main_sub_vfo, fpf,
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AG%c%03d%c", main_sub_vfo, fpf,
|
||||||
cat_term);
|
cat_term);
|
||||||
|
@ -3908,7 +3908,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
val.i, cat_term);
|
val.i, cat_term);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4091,7 +4092,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
{
|
{
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PA00%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PA00%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4115,7 +4117,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
RETURNFUNC(-RIG_EINVAL);
|
RETURNFUNC(-RIG_EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4132,7 +4135,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
{
|
{
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RA00%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RA00%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4156,7 +4160,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
RETURNFUNC(-RIG_EINVAL);
|
RETURNFUNC(-RIG_EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4178,7 +4183,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
scale = 255;
|
scale = 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_ftdx10 || is_ft710) main_sub_vfo = 0;
|
if (is_ftdx10 || is_ft710) { main_sub_vfo = 0; }
|
||||||
|
|
||||||
fpf = newcat_scale_float(scale, val.f);
|
fpf = newcat_scale_float(scale, val.f);
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RG%c%03d%c", main_sub_vfo, fpf,
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RG%c%03d%c", main_sub_vfo, fpf,
|
||||||
|
@ -4231,7 +4236,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RL0%02d%c", fpf, cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RL0%02d%c", fpf, cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4555,7 +4561,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
{
|
{
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BP%03d%c", val.i, cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BP%03d%c", val.i, cat_term);
|
||||||
}
|
}
|
||||||
else if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
else if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4628,7 +4635,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL00%02d%c", fpf, cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL00%02d%c", fpf, cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710 && !is_ftdx101mp)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710
|
||||||
|
&& !is_ftdx101mp)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4694,7 +4702,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PA0%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PA0%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4752,7 +4761,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "IS%c%c", main_sub_vfo,
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "IS%c%c", main_sub_vfo,
|
||||||
cat_term);
|
cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4837,7 +4847,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RA0%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RA0%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4871,7 +4882,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RL0%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RL0%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -4931,7 +4943,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL0%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL0%c", cat_term);
|
||||||
|
|
||||||
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710 && !is_ftdx101mp)
|
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710
|
||||||
|
&& !is_ftdx101mp)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
@ -5126,7 +5139,8 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
{
|
{
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BP%c", cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BP%c", cat_term);
|
||||||
}
|
}
|
||||||
else if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000 && !is_ftdx10 && !is_ft710)
|
else if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ft2000
|
||||||
|
&& !is_ftdx10 && !is_ft710)
|
||||||
{
|
{
|
||||||
priv->cmd_str[2] = main_sub_vfo;
|
priv->cmd_str[2] = main_sub_vfo;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue