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

Convert COMP

pull/1346/head
George Baltz N3GB 2023-07-26 16:54:10 -04:00
rodzic d1106cae8b
commit bb260d2640
4 zmienionych plików z 6 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
rigs/yaesu/ft2000.c
Wyświetl plik

@ -158,10 +158,9 @@ const struct rig_caps ft2000_caps =
.level_gran = {
#include "level_gran_yaesu.h"
// cppcheck-suppress *
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 4000 }, .step = { .i = 10 } },
[LVL_COMP] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
},
.ctcss_list = common_ctcss_list,
.dcs_list = NULL,

4
rigs/yaesu/ft5000.c
Wyświetl plik

@ -165,10 +165,8 @@ const struct rig_caps ftdx5000_caps =
{
#include "level_gran_yaesu.h"
// cppcheck-suppress *
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 10 } },
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 4000 }, .step = { .i = 10 } },
[LVL_COMP] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
},
.ctcss_list = common_ctcss_list,
.dcs_list = NULL,

3
rigs/yaesu/ft9000.c
Wyświetl plik

@ -73,10 +73,9 @@ const struct rig_caps ft9000_caps =
{
#include "level_gran_yaesu.h"
// cppcheck-suppress *
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3000 }, .step = { .i = 10 } },
[LVL_COMP] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
},
.ctcss_list = common_ctcss_list,
.dcs_list = NULL,

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

@ -4497,16 +4497,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft2000 || is_ftdx9000 || is_ftdx5000)
{
scale = 255;
}
else
{
scale = 100;
}
fpf = (int) ((val.f / level_info->step.f) + 0.5f);
fpf = newcat_scale_float(scale, val.f);
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PL%03d%c", fpf, cat_term);
break;
@ -5476,7 +5468,6 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_VOXGAIN:
case RIG_LEVEL_COMP:
if (is_ft2000 || is_ftdx9000 || is_ftdx5000 || is_ft450)
{
scale = 255;
@ -5628,9 +5619,10 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_MICGAIN:
case RIG_LEVEL_AF:
case RIG_LEVEL_RF:
case RIG_LEVEL_COMP:
case RIG_LEVEL_MICGAIN:
val->f = (float)atoi(retlvl) * level_info->step.f;
break;