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

more ext functions

pull/179/head
Malcolm Herring 2020-01-05 08:01:46 +00:00
rodzic 4975150611
commit 11492d3ece
3 zmienionych plików z 28 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
icom/icom.c
Wyświetl plik

@ -420,6 +420,7 @@ const struct confparams icom_ext_parms[] =
{ TOK_DRIVE_GAIN, "drive_gain", "Drive gain", "", "", RIG_CONF_NUMERIC, { .n = { 0, 255, 1 } } },
{ TOK_DIGI_SEL_FUNC, "digi_sel", "DIGI-SEL enable", "", "", RIG_CONF_CHECKBUTTON, {} },
{ TOK_DIGI_SEL_LEVEL, "digi_sel_level", "DIGI-SEL level", "", "", RIG_CONF_NUMERIC, { .n = { 0, 255, 1 } } },
{ TOK_KEY_BEEP, "beep", "Key beep enable", "", "", RIG_CONF_CHECKBUTTON, {} },
{ RIG_CONF_END, NULL, }
};
@ -443,6 +444,7 @@ const struct cmdparams icom_ext_cmd[] =
{ TOK_DRIVE_GAIN, C_CTL_LVL, S_LVL_DRIVE, SC_MOD_RW, 1, {0}, CMD_DAT_FLT, 2 },
{ TOK_DIGI_SEL_FUNC, C_CTL_FUNC, S_FUNC_DIGISEL, SC_MOD_RW, 1, {0}, CMD_DAT_BOL, 1 },
{ TOK_DIGI_SEL_LEVEL, C_CTL_LVL, S_LVL_DIGI, SC_MOD_RW, 1, {0}, CMD_DAT_FLT, 2 },
{ TOK_KEY_BEEP, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x38}, CMD_DAT_BOL, 1 },
{ 0 }
};
@ -2504,7 +2506,7 @@ int icom_get_ext_cmd(RIG *rig, vfo_t vfo, token_t token, value_t *val)
continue;
}
if (cmd[i].token == token) {
if (!(cmd[i].submod & SC_MOD_WR)) break;
if (!(cmd[i].submod & SC_MOD_RD)) break;
if ((cmd[i].submod & SC_MOD_RW12) == SC_MOD_RW12) {
retval = icom_get_raw_buf(rig, cmd[i].command, cmd[i].subcmd,
1, &ssc, &reslen, resbuf);
@ -2581,7 +2583,7 @@ int icom_set_ext_cmd(RIG *rig, vfo_t vfo, token_t token, value_t val)
continue;
}
if (cmd[i].token == token) {
if (!(cmd[i].submod & SC_MOD_RD)) break;
if (!(cmd[i].submod & SC_MOD_WR)) break;
if ((cmd[i].submod & SC_MOD_RW12) == SC_MOD_RW12) {
cmdbuf[0] = 0x01;
cmdlen = 1;

11
icom/icom_defs.h
Wyświetl plik

@ -413,6 +413,8 @@
/* IC-R30 */
#define S_MEM_ANL 0x00 /* ANL Off/On */
#define S_MEM_EAR 0x01 /* Earphone mode Off/On */
#define S_MEM_REC 0x09 /* Recorder Off/On */
/*
* Tone control (C_SET_TONE) subcommands
@ -508,6 +510,9 @@
#define TOK_DIGI_SEL_FUNC TOKEN_BACKEND(104)
#define TOK_DIGI_SEL_LEVEL TOKEN_BACKEND(105)
#define TOK_KEY_BEEP TOKEN_BACKEND(106)
#define TOK_ANL_R30 TOKEN_BACKEND(110)
#define TOK_EAR_R30 TOKEN_BACKEND(111)
#define TOK_REC_R30 TOKEN_BACKEND(112)
#define TOK_DSTAR_CALL_SIGN TOKEN_BACKEND(120)
#define TOK_DSTAR_MESSAGE TOKEN_BACKEND(121)
#define TOK_DSTAR_STATUS TOKEN_BACKEND(122)
@ -516,9 +521,9 @@
#define TOK_DSTAR_DSQL TOKEN_BACKEND(125)
#define TOK_DSTAR_MY_CS TOKEN_BACKEND(126)
#define TOK_DSTAR_TX_CS TOKEN_BACKEND(127)
#define TOK_DSTAR_TX_MESS TOKEN_BACKEND(114)
#define TOK_DSTAR_TX_DATA TOKEN_BACKEND(115)
#define TOK_DSTAR_CODE TOKEN_BACKEND(116)
#define TOK_DSTAR_TX_MESS TOKEN_BACKEND(128)
#define TOK_DSTAR_TX_DATA TOKEN_BACKEND(129)
#define TOK_DSTAR_CODE TOKEN_BACKEND(130)
/*
* icom_ext_parm table subcommand modifiers

24
icom/icr30.c
Wyświetl plik

@ -47,20 +47,26 @@
#define ICR30_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL)
#define ICR30_SCAN_OPS (RIG_SCAN_NONE)
struct confparams icr30_ext[] = {
{ TOK_ANL_R30, "anl", "Auto noise limiter", "", "", RIG_CONF_CHECKBUTTON, {} },
{ TOK_EAR_R30, "ear", "Earphone mode", "", "", RIG_CONF_CHECKBUTTON, {} },
{ TOK_REC_R30, "record", "Recorder on/off", "", "", RIG_CONF_CHECKBUTTON, {} },
{ 0 }
};
struct cmdparams icr30_cmd[] = {
{ TOK_ANL_R30, C_CTL_MEM, S_MEM_ANL, SC_MOD_RW, 0, {}, CMD_DAT_BOL, 1 },
{ TOK_EAR_R30, C_CTL_MEM, S_MEM_EAR, SC_MOD_RW, 0, {}, CMD_DAT_BOL, 1 },
{ TOK_REC_R30, C_CTL_MEM, S_MEM_REC, SC_MOD_WR, 0, {}, CMD_DAT_BOL, 1 },
{ TOK_LINK }
};
#define ICR30_STR_CAL { 2, \
{ \
{ 0, -60 }, /* S0 */ \
{ 255, 60 } /* +60 */ \
} }
struct confparams icr30_ext[] = {
{ 0 }
};
struct cmdparams icr30_cmd[] = {
{ TOK_LINK }
};
/*
* This function does the special bandwidth coding for IC-R30
* (1 - normal, 2 - narrow)
@ -243,6 +249,8 @@ const struct rig_caps icr30_caps =
.get_parm = icom_get_parm,
.set_ext_parm = icom_set_ext_parm,
.get_ext_parm = icom_get_ext_parm,
.set_ext_level = icom_set_ext_level,
.get_ext_level = icom_get_ext_level,
.get_dcd = icom_get_dcd,
.set_ctcss_sql = icom_set_ctcss_sql,
.get_ctcss_sql = icom_get_ctcss_sql,