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

Fix dumpcap level_gran for Yaesu rigs

pull/1148/head
Mike Black W9MDB 2022-11-11 16:56:42 -06:00
rodzic d7ab039573
commit c844b02ed1
38 zmienionych plików z 207 dodań i 77 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -178,6 +178,10 @@ const struct rig_caps frg100_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_BACKLIGHT,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_FROM_VFO | RIG_OP_TO_VFO | RIG_OP_UP | RIG_OP_DOWN,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },

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

@ -79,6 +79,10 @@ const struct rig_caps frg8800_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_NONE,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },

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

@ -74,6 +74,10 @@ const struct rig_caps frg9600_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_NONE,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },

7
rigs/yaesu/ft100.c
Wyświetl plik

@ -316,7 +316,7 @@ const struct rig_caps ft100_caps =
RIG_MODEL(RIG_MODEL_FT100),
.model_name = "FT-100",
.mfg_name = "Yaesu",
.version = "20210929.0",
.version = "20211111.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -339,7 +339,10 @@ const struct rig_caps ft100_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = ft100_ctcss_list,
.dcs_list = ft100_dcs_list,

6
rigs/yaesu/ft1000d.c
Wyświetl plik

@ -270,7 +270,7 @@ const struct rig_caps ft1000d_caps =
RIG_MODEL(RIG_MODEL_FT1000D),
.model_name = "FT-1000D",
.mfg_name = "Yaesu",
.version = "20210121.0",
.version = "20211111.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -294,6 +294,10 @@ const struct rig_caps ft1000d_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_BACKLIGHT,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

12
rigs/yaesu/ft1000mp.c
Wyświetl plik

@ -340,6 +340,10 @@ const struct rig_caps ft1000mp_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = ft1000mp_ctcss_list,
.dcs_list = NULL,
.vfo_ops = FT1000MP_VFO_OPS,
@ -479,6 +483,10 @@ const struct rig_caps ft1000mpmkv_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = ft1000mp_ctcss_list,
.dcs_list = NULL,
.vfo_ops = FT1000MP_VFO_OPS,
@ -618,6 +626,10 @@ const struct rig_caps ft1000mpmkvfld_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = ft1000mp_ctcss_list,
.dcs_list = NULL,
.vfo_ops = FT1000MP_VFO_OPS,

8
rigs/yaesu/ft1200.c
Wyświetl plik

@ -32,8 +32,8 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft1200.h"
#include "idx_builtin.h"
#include "tones.h"
const struct newcat_priv_caps ftdx1200_priv_caps =
@ -150,7 +150,7 @@ const struct rig_caps ftdx1200_caps =
RIG_MODEL(RIG_MODEL_FTDX1200),
.model_name = "FTDX-1200",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".3",
.version = NEWCAT_VER ".4",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -173,7 +173,9 @@ const struct rig_caps ftdx1200_caps =
.has_set_level = RIG_LEVEL_SET(FTDX1200_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.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 = 10 } },

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

@ -34,7 +34,6 @@
#include "yaesu.h"
#include "newcat.h"
#include "ft2000.h"
#include "idx_builtin.h"
#include "tones.h"
const struct newcat_priv_caps ft2000_priv_caps =
@ -134,7 +133,7 @@ const struct rig_caps ft2000_caps =
RIG_MODEL(RIG_MODEL_FT2000),
.model_name = "FT-2000",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".1",
.version = NEWCAT_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -158,6 +157,7 @@ const struct rig_caps ft2000_caps =
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.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 } },

5
rigs/yaesu/ft3000.c
Wyświetl plik

@ -32,8 +32,8 @@
#include "newcat.h"
#include "bandplan.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft5000.h"
#include "idx_builtin.h"
#include "tones.h"
const struct newcat_priv_caps ftdx3000_priv_caps =
@ -244,7 +244,7 @@ const struct rig_caps ftdx3000_caps =
RIG_MODEL(RIG_MODEL_FTDX3000),
.model_name = "FTDX-3000",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".8",
.version = NEWCAT_VER ".9",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -270,6 +270,7 @@ const struct rig_caps ftdx3000_caps =
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
#include "level_gran_yaesu.h"
[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 } },

6
rigs/yaesu/ft450.c
Wyświetl plik

@ -31,8 +31,8 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft450.h"
#include "idx_builtin.h"
/*
* FT-450 rig capabilities
@ -65,7 +65,9 @@ const struct rig_caps ft450_caps =
.has_set_level = RIG_LEVEL_SET(FT450_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.level_gran =
{
#include "level_gran_yaesu.h"
// cppcheck-suppress *
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
[LVL_CWPITCH] = { .min = { .i = 400 }, .max = { .i = 800 }, .step = { .i = 100 } },

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

@ -30,8 +30,8 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft5000.h"
#include "idx_builtin.h"
#include "tones.h"
const struct newcat_priv_caps ftdx5000_priv_caps =
@ -163,7 +163,9 @@ const struct rig_caps ftdx5000_caps =
.has_set_level = RIG_LEVEL_SET(FTDX5000_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.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 = 10 } },

5
rigs/yaesu/ft600.c
Wyświetl plik

@ -259,7 +259,10 @@ const struct rig_caps ft600_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = RIG_FUNC_NONE,
.dcs_list = RIG_FUNC_NONE,

6
rigs/yaesu/ft710.c
Wyświetl plik

@ -30,9 +30,9 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "idx_builtin.h"
#include "tones.h"
#include "newcat.h"
#include "yaesu.h"
#include "ftdx10.h" // reuse this until we know different
const struct newcat_priv_caps ft710_priv_caps =
@ -160,7 +160,9 @@ const struct rig_caps ft710_caps =
.has_set_level = RIG_LEVEL_SET(FTDX10_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.level_gran =
{
#include "level_gran_yaesu.h"
[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 } },

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

@ -121,6 +121,10 @@ const struct rig_caps ft736_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_NONE,
.ctcss_list = ft736_ctcss_list,
.preamp = { RIG_DBLST_END, },

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

@ -326,6 +326,10 @@ const struct rig_caps ft747_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

8
rigs/yaesu/ft757gx.c
Wyświetl plik

@ -138,6 +138,10 @@ const struct rig_caps ft757gx_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },
@ -251,6 +255,10 @@ const struct rig_caps ft757gx2_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_CPY | RIG_OP_FROM_VFO | RIG_OP_TO_VFO |
RIG_OP_UP | RIG_OP_DOWN,
.ctcss_list = NULL,

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

@ -284,6 +284,10 @@ const struct rig_caps ft767gx_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = static_767gx_ctcss_list,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

10
rigs/yaesu/ft817.c
Wyświetl plik

@ -319,7 +319,10 @@ const struct rig_caps ft817_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 out of 106 supported */
@ -466,7 +469,10 @@ const struct rig_caps ft818_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 out of 106 supported */

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

@ -269,6 +269,10 @@ const struct rig_caps ft840_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

20
rigs/yaesu/ft847.c
Wyświetl plik

@ -410,7 +410,10 @@ const struct rig_caps ft847_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = ft847_ctcss_list,
.dcs_list = common_dcs_list,
@ -565,7 +568,10 @@ const struct rig_caps ft650_caps =
//.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
//.ctcss_list = ft847_ctcss_list,
.preamp = { RIG_DBLST_END, }, /* no preamp/att in CAT */
@ -695,7 +701,10 @@ const struct rig_caps mchfqrp_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = ft847_ctcss_list,
.dcs_list = common_dcs_list,
@ -865,7 +874,10 @@ const struct rig_caps ft847uni_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = ft847_ctcss_list,
.dcs_list = common_dcs_list,

5
rigs/yaesu/ft857.c
Wyświetl plik

@ -269,7 +269,10 @@ const struct rig_caps ft857_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 supported */

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

@ -421,6 +421,10 @@ const struct rig_caps ft890_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

6
rigs/yaesu/ft891.c
Wyświetl plik

@ -37,8 +37,8 @@
#include "bandplan.h"
#include "serial.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft891.h"
#include "idx_builtin.h"
/* Prototypes */
static int ft891_init(RIG *rig);
@ -156,7 +156,9 @@ const struct rig_caps ft891_caps =
.has_set_level = RIG_LEVEL_SET(FT891_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.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 } },

10
rigs/yaesu/ft897.c
Wyświetl plik

@ -273,7 +273,10 @@ const struct rig_caps ft897_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 supported */
@ -417,7 +420,10 @@ const struct rig_caps ft897d_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.level_gran =
{
#include "level_gran_yaesu.h"
},
.parm_gran = {},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list, /* only 104 supported */

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

@ -443,6 +443,10 @@ const struct rig_caps ft900_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

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

@ -35,7 +35,6 @@
#include "yaesu.h"
#include "newcat.h"
#include "ft9000.h"
#include "idx_builtin.h"
#include "tones.h"
/*
@ -72,7 +71,9 @@ const struct rig_caps ft9000_caps =
.has_set_level = RIG_LEVEL_SET(FT9000_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.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 } },

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

@ -432,6 +432,10 @@ const struct rig_caps ft920_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

5
rigs/yaesu/ft950.c
Wyświetl plik

@ -34,7 +34,6 @@
#include "yaesu.h"
#include "newcat.h"
#include "ft950.h"
#include "idx_builtin.h"
const struct newcat_priv_caps ft950_priv_caps =
{
@ -110,7 +109,9 @@ const struct rig_caps ft950_caps =
.has_set_level = RIG_LEVEL_SET(FT950_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.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 } },

4
rigs/yaesu/ft980.h
Wyświetl plik

@ -169,6 +169,10 @@ const struct rig_caps ft980_caps =
.has_set_level = RIG_LEVEL_NONE,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = FT980_VFO_OPS,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },

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

@ -262,6 +262,10 @@ const struct rig_caps ft990_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_BACKLIGHT,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.ctcss_list = NULL,
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },

41
rigs/yaesu/ft991.c
Wyświetl plik

@ -37,8 +37,8 @@
#include "hamlib/rig.h"
#include "misc.h"
#include "newcat.h"
#include "yaesu.h"
#include "ft991.h"
#include "idx_builtin.h"
/* Prototypes */
static int ft991_init(RIG *rig);
@ -165,44 +165,7 @@ const struct rig_caps ft991_caps =
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
// cppcheck-suppress *
/* raw data */
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
/* levels with dB units */
[LVL_PREAMP] = { .min = { .i = 10 }, .max = { .i = 20 }, .step = { .i = 10 } },
[LVL_ATT] = { .min = { .i = 12 }, .max = { .i = 12 }, .step = { .i = 0 } },
[LVL_STRENGTH] = { .min = { .i = 0 }, .max = { .i = 60 }, .step = { .i = 0 } },
[LVL_NB] = { .min = { .f = 0 }, .max = { .f = 10 }, .step = { .f = 1 } },
/* levels with WPM units */
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
/* levels with Hz units */
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_IF] = { .min = { .i = -1200 }, .max = { .i = 1200 }, .step = { .i = 20 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } },
/* levels with time units */
[LVL_VOXDELAY] = { .min = { .i = 3 }, .max = { .i = 300 }, .step = { .i = 1 } },
[LVL_BKINDL] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
[LVL_BKIN_DLYMS] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
/* level with misc units */
[LVL_SWR] = { .min = { .f = 0 }, .max = { .f = 5.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_BAND_SELECT] = { .min = { .i = 0 }, .max = { .i = 16 }, .step = { .i = 1 } },
/* levels with 0-1 values -- increment based on rig's range */
[LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/10.0f } },
[LVL_AF] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_RF] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_RFPOWER] = { .min = { .f = .05 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_RFPOWER_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_RFPOWER_METER_WATTS] = { .min = { .f = .0 }, .max = { .f = 100 }, .step = { .f = 1.0f/255.0f } },
[LVL_COMP_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_ID_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_VD_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_SQL] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/100.0f } },
[LVL_MICGAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_MONITOR_GAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_COMP] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_VOXGAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_ANTIVOX] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_ALC] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
#include "level_gran_yaesu.h"
},
.ctcss_list = common_ctcss_list,
.dcs_list = common_dcs_list,

6
rigs/yaesu/ftdx10.c
Wyświetl plik

@ -30,9 +30,9 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "idx_builtin.h"
#include "tones.h"
#include "newcat.h"
#include "yaesu.h"
#include "ftdx10.h"
const struct newcat_priv_caps ftdx10_priv_caps =
@ -160,7 +160,9 @@ const struct rig_caps ftdx10_caps =
.has_set_level = RIG_LEVEL_SET(FTDX10_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.level_gran =
{
#include "level_gran_yaesu.h"
[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 } },

6
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -30,9 +30,9 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "idx_builtin.h"
#include "tones.h"
#include "newcat.h"
#include "yaesu.h"
#include "ftdx101.h"
const struct newcat_priv_caps ftdx101d_priv_caps =
@ -160,7 +160,9 @@ const struct rig_caps ftdx101d_caps =
.has_set_level = RIG_LEVEL_SET(FTDX101_LEVELS),
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {
.level_gran =
{
#include "level_gran_yaesu.h"
[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 } },

2
rigs/yaesu/ftdx101mp.c
Wyświetl plik

@ -31,9 +31,9 @@
#include "hamlib/rig.h"
#include "bandplan.h"
#include "idx_builtin.h"
#include "tones.h"
#include "newcat.h"
#include "yaesu.h"
#include "ftdx101.h"
const struct newcat_priv_caps ftdx101mp_priv_caps =

41
rigs/yaesu/level_gran_yaesu.h 100644
Wyświetl plik

@ -0,0 +1,41 @@
// Once included these values can be overidden in the back-end
// Known variants are PREAMP, ATT, NB, CWPITCH, IF, NOTCHF, VOXDELAY, BKINDL, BKIN_DLYMS, RFPOWER_METER(255 or 100), RFPOWER_METER_WATTS(255 or 100)
// cppcheck-suppress *
/* raw data */
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
/* levels with dB units */
[LVL_PREAMP] = { .min = { .i = 10 }, .max = { .i = 20 }, .step = { .i = 10 } },
[LVL_ATT] = { .min = { .i = 12 }, .max = { .i = 12 }, .step = { .i = 0 } },
[LVL_STRENGTH] = { .min = { .i = 0 }, .max = { .i = 60 }, .step = { .i = 0 } },
[LVL_NB] = { .min = { .f = 0 }, .max = { .f = 10 }, .step = { .f = 1 } },
/* levels with WPM units */
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
/* levels with Hz units */
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_IF] = { .min = { .i = -1200 }, .max = { .i = 1200 }, .step = { .i = 20 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } },
/* levels with time units */
[LVL_VOXDELAY] = { .min = { .i = 3 }, .max = { .i = 300 }, .step = { .i = 1 } },
[LVL_BKINDL] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
[LVL_BKIN_DLYMS] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
/* level with misc units */
[LVL_SWR] = { .min = { .f = 0 }, .max = { .f = 5.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_BAND_SELECT] = { .min = { .i = 0 }, .max = { .i = 16 }, .step = { .i = 1 } },
/* levels with 0-1 values -- increment based on rig's range */
[LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/10.0f } },
[LVL_AF] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_RF] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_RFPOWER] = { .min = { .f = .05 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_RFPOWER_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_RFPOWER_METER_WATTS] = { .min = { .f = .0 }, .max = { .f = 100 }, .step = { .f = 1.0f/255.0f } },
[LVL_COMP_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_ID_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_VD_METER] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_SQL] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/100.0f } },
[LVL_MICGAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_MONITOR_GAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_COMP] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_VOXGAIN] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_ANTIVOX] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_ALC] = { .min = { .f = .0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },

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

@ -152,6 +152,10 @@ const struct rig_caps vr5000_caps =
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#include "level_gran_yaesu.h"
},
.vfo_ops = RIG_OP_NONE,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, },

1
rigs/yaesu/vx1700.c
Wyświetl plik

@ -34,7 +34,6 @@
#include <stdio.h>
#include <string.h>
#include "idx_builtin.h"
#include "hamlib/rig.h"
#include "bandplan.h"
#include "serial.h"

1
rigs/yaesu/yaesu.h
Wyświetl plik

@ -26,6 +26,7 @@
#ifndef _YAESU_H
#define _YAESU_H 1
#include "idx_builtin.h"
/*
* Length (in bytes) of yaesu command sequences