mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

astyle newcat.c

pull/1173/head
Mike Black W9MDB 2022-12-01 17:18:48 -06:00
rodzic 57f6c863c6
commit aaab26686a
1 zmienionych plików z 51 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

88
rigs/yaesu/newcat.c
Wyświetl plik

@ -3810,9 +3810,9 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (val.f > 1.0) { RETURNFUNC(-RIG_EINVAL); }
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,
cat_term);
break;
@ -3908,7 +3908,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
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;
}
@ -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);
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;
}
@ -4115,7 +4117,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
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;
}
@ -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);
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;
}
@ -4156,7 +4160,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
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;
}
@ -4177,8 +4182,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
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);
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);
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;
}
@ -4373,12 +4379,12 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
fpf = newcat_scale_float(scale, val.f);
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "SQ%c%03d%c", main_sub_vfo, fpf,
cat_term);
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710)
{
priv->cmd_str[2] = main_sub_vfo;
}
{
priv->cmd_str[2] = main_sub_vfo;
}
break;
case RIG_LEVEL_VOXDELAY:
@ -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);
}
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;
}
@ -4627,8 +4634,9 @@ 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);
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;
}
@ -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);
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;
}
@ -4709,12 +4718,12 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "AG%c%c", main_sub_vfo,
cat_term);
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710)
{
priv->cmd_str[2] = main_sub_vfo;
}
break;
case RIG_LEVEL_AGC:
@ -4725,12 +4734,12 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "GT%c%c", main_sub_vfo,
cat_term);
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710)
{
priv->cmd_str[2] = main_sub_vfo;
}
break;
case RIG_LEVEL_IF:
@ -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,
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;
}
@ -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);
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;
}
@ -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);
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;
}
@ -4895,12 +4907,12 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "SQ%c%c", main_sub_vfo,
cat_term);
if (rig->caps->targetable_vfo & RIG_TARGETABLE_LEVEL && !is_ftdx10 && !is_ft710)
{
priv->cmd_str[2] = main_sub_vfo;
}
{
priv->cmd_str[2] = main_sub_vfo;
}
break;
case RIG_LEVEL_VOXDELAY:
@ -4930,12 +4942,13 @@ 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);
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;
}
}
break;
/*
@ -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);
}
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;
}