From d0d333994c21f9778af505d60863ec5e5f855231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Thu, 1 Mar 2001 00:26:19 +0000 Subject: [PATCH] * added new fields in caps: ctcss_list, dcs_list, chan_list (maintainers, please populate them!) git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@410 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- aor/ar8200.c | 6 +++++- dummy/dummy.c | 15 ++++++++++++--- icom/ic706.c | 21 +++++++++++++++++++-- icom/icr8500.c | 6 +++++- kenwood/ts870s.c | 6 +++++- winradio/winradio.c | 7 ++++++- yaesu/ft747.c | 6 +++++- yaesu/ft847.c | 6 +++++- 8 files changed, 62 insertions(+), 11 deletions(-) diff --git a/aor/ar8200.c b/aor/ar8200.c index 88b43eed1..f4846c67e 100644 --- a/aor/ar8200.c +++ b/aor/ar8200.c @@ -7,7 +7,7 @@ * using the serial interface. * * - * $Id: ar8200.c,v 1.5 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: ar8200.c,v 1.6 2001-03-01 00:26:19 f4cfe Exp $ * * * @@ -59,6 +59,8 @@ const struct rig_caps ar8200_caps = { 9600, 19200, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_XONXOFF, 0, 0, 200, 3, RIG_FUNC_NONE, AR8200_FUNC_ALL, AR8200_LEVEL_ALL, AR8200_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { RIG_DBLST_END, }, { RIG_DBLST_END, }, 0, @@ -66,6 +68,8 @@ const struct rig_caps ar8200_caps = { 0, RIG_TRN_ON, 1000, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { diff --git a/dummy/dummy.c b/dummy/dummy.c index 230bea03d..38a2ad102 100644 --- a/dummy/dummy.c +++ b/dummy/dummy.c @@ -7,7 +7,7 @@ * purpose mainly. * * - * $Id: dummy.c,v 1.3 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: dummy.c,v 1.4 2001-03-01 00:26:19 f4cfe Exp $ * * * This program is free software; you can redistribute it and/or @@ -416,7 +416,7 @@ static int dummy_set_poweroff(RIG *rig) } -static int dummy_set_ann(RIG *rig, ann_t ann) +static int dummy_set_parm(RIG *rig, setting_t parm, value_t val) { rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n"); @@ -424,7 +424,7 @@ static int dummy_set_ann(RIG *rig, ann_t ann) } -static int dummy_get_ann(RIG *rig, ann_t *ann) +static int dummy_get_parm(RIG *rig, setting_t parm, value_t *val) { rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n"); @@ -564,6 +564,11 @@ const struct rig_caps dummy_caps = { has_set_func: DUMMY_FUNC, has_get_level: DUMMY_LEVEL, has_set_level: DUMMY_SET_LEVEL, + has_get_parm: RIG_PARM_NONE, /* FIXME */ + has_set_parm: RIG_PARM_NONE, /* FIXME */ + ctcss_list: NULL, /* FIXME */ + dcs_list: NULL, /* FIXME */ + chan_list: { RIG_CHAN_END, }, /* FIXME */ transceive: RIG_TRN_OFF, attenuator: { 10, 20, 30, RIG_DBLST_END, }, vfo_list: 0, /* FIXME */ @@ -595,6 +600,8 @@ const struct rig_caps dummy_caps = { get_level: dummy_get_level, set_func: dummy_set_func, get_func: dummy_get_func, + set_parm: dummy_set_parm, + get_parm: dummy_get_parm, get_info: dummy_get_info, @@ -624,8 +631,10 @@ const struct rig_caps dummy_caps = { get_ts: dummy_get_ts, power2mW: dummy_power2mW, mW2power: dummy_mW2power, +#if 0 set_ann: dummy_set_ann, get_ann: dummy_get_ann, +#endif set_ant: dummy_set_ant, get_ant: dummy_get_ant, set_bank: dummy_set_bank, diff --git a/icom/ic706.c b/icom/ic706.c index 678e0fb2f..9255190db 100644 --- a/icom/ic706.c +++ b/icom/ic706.c @@ -7,7 +7,7 @@ * using the "CI-V" interface. * * - * $Id: ic706.c,v 1.14 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: ic706.c,v 1.15 2001-03-01 00:26:19 f4cfe Exp $ * * * @@ -67,6 +67,8 @@ const struct rig_caps ic706_caps = { 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, 0, 0, 200, 3, RIG_FUNC_NONE, IC706_FUNC_ALL, RIG_FUNC_NONE, IC706_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { 20, RIG_DBLST_END, }, { 20, RIG_DBLST_END, }, 0, /* TBC: RIT controllable? */ @@ -74,6 +76,8 @@ const struct rig_caps ic706_caps = { 0, RIG_TRN_ON, 101, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ @@ -139,6 +143,8 @@ const struct rig_caps ic706mkii_caps = { 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, 0, 0, 200, 3, RIG_FUNC_NONE, IC706_FUNC_ALL, RIG_FUNC_NONE, IC706_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { 20, RIG_DBLST_END, }, { 20, RIG_DBLST_END, }, 0, /* TBC: RIT controllable? */ @@ -146,6 +152,8 @@ const struct rig_caps ic706mkii_caps = { 0, RIG_TRN_ON, 101, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ @@ -215,12 +223,21 @@ const struct rig_caps ic706mkiig_caps = { 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, 0, 0, 200, 3, RIG_FUNC_NONE, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF, IC706_LEVEL_ALL, IC706_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + icom_ctcss_list, NULL, { 20, RIG_DBLST_END, }, { 20, RIG_DBLST_END, }, 9999, /* RIT */ 0, /* FIXME: VFO list */ 0, RIG_TRN_ON, - 101, 0, 0, + 105, 0, 0, + + /* memory channel list */ + { { 01, 99, RIG_MTYPE_MEM, 0 }, + { 100, 103, RIG_MTYPE_EDGE, 0 }, + { 104, 105, RIG_MTYPE_CALL, 0 }, + RIG_CHAN_END, + }, { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, diff --git a/icom/icr8500.c b/icom/icr8500.c index 98d879814..a0b776364 100644 --- a/icom/icr8500.c +++ b/icom/icr8500.c @@ -7,7 +7,7 @@ * using the "CI-V" interface. * * - * $Id: icr8500.c,v 1.5 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: icr8500.c,v 1.6 2001-03-01 00:26:19 f4cfe Exp $ * * * @@ -59,6 +59,8 @@ const struct rig_caps icr8500_caps = { 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, 0, 0, 200, 3, RIG_FUNC_NONE, ICR8500_FUNC_ALL, ICR8500_LEVEL_ALL, ICR8500_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { 20, RIG_DBLST_END, }, { 20, RIG_DBLST_END, }, 9999, @@ -66,6 +68,8 @@ const struct rig_caps icr8500_caps = { 0, RIG_TRN_ON, 999, 12, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, diff --git a/kenwood/ts870s.c b/kenwood/ts870s.c index ce56c366f..639c8e103 100644 --- a/kenwood/ts870s.c +++ b/kenwood/ts870s.c @@ -7,7 +7,7 @@ * using the serial interface. * * - * $Id: ts870s.c,v 1.7 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: ts870s.c,v 1.8 2001-03-01 00:26:19 f4cfe Exp $ * * * @@ -62,6 +62,8 @@ const struct rig_caps ts870s_caps = { 1200, 57600, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, 0, 0, 200, 3, RIG_FUNC_NONE, TS870S_FUNC_ALL, TS870S_LEVEL_ALL, TS870S_LEVEL_ALL, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { RIG_DBLST_END, }, /* FIXME! */ { RIG_DBLST_END, }, 9999, @@ -69,6 +71,8 @@ const struct rig_caps ts870s_caps = { 0, RIG_TRN_ON, 1000, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { diff --git a/winradio/winradio.c b/winradio/winradio.c index 111ccf996..54967c042 100644 --- a/winradio/winradio.c +++ b/winradio/winradio.c @@ -8,7 +8,7 @@ * /dev/winradio API. * * - * $Id: winradio.c,v 1.4 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: winradio.c,v 1.5 2001-03-01 00:26:19 f4cfe Exp $ * * * This program is free software; you can redistribute it and/or @@ -197,6 +197,11 @@ const struct rig_caps wr1500_caps = { has_set_func: WR1500_FUNC, has_get_level: WR1500_LEVEL, has_set_level: WR1500_SET_LEVEL, + has_get_parm: RIG_PARM_NONE, /* FIXME */ + has_set_parm: RIG_PARM_NONE, /* FIXME */ + ctcss_list: NULL, /* FIXME */ + dcs_list: NULL, /* FIXME */ + chan_list: { RIG_CHAN_END, }, /* FIXME */ transceive: RIG_TRN_OFF, attenuator: { 20, RIG_DBLST_END, }, rx_range_list2: { {start:kHz(150),end:MHz(1500),modes:WR1500_MODES, diff --git a/yaesu/ft747.c b/yaesu/ft747.c index 7ea24eb51..4b0412f1b 100644 --- a/yaesu/ft747.c +++ b/yaesu/ft747.c @@ -7,7 +7,7 @@ * box (FIF-232C) or similar * * - * $Id: ft747.c,v 1.7 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: ft747.c,v 1.8 2001-03-01 00:26:19 f4cfe Exp $ * * * This program is free software; you can redistribute it and/or @@ -132,6 +132,8 @@ const struct rig_caps ft747_caps = { 4800, 4800, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0, FT747_FUNC_ALL, FT747_FUNC_ALL, RIG_LEVEL_NONE, RIG_LEVEL_NONE, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { RIG_DBLST_END, }, /* FIXME! */ { RIG_DBLST_END, }, 9999, @@ -139,6 +141,8 @@ const struct rig_caps ft747_caps = { 0, RIG_TRN_OFF, 20, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory channel list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, RIG_FRNG_END, }, /* rx range */ diff --git a/yaesu/ft847.c b/yaesu/ft847.c index a1a7afa39..3d57358c4 100644 --- a/yaesu/ft847.c +++ b/yaesu/ft847.c @@ -6,7 +6,7 @@ * via serial interface to an FT-847 using the "CAT" interface. * * - * $Id: ft847.c,v 1.7 2001-02-27 23:03:45 f4cfe Exp $ + * $Id: ft847.c,v 1.8 2001-03-01 00:26:19 f4cfe Exp $ * * * @@ -189,6 +189,8 @@ const struct rig_caps ft847_caps = { 4800, 57600, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, FT847_WRITE_DELAY, FT847_POST_WRITE_DELAY, 100, 0, RIG_FUNC_NONE, FT847_FUNC_ALL, RIG_LEVEL_NONE, RIG_LEVEL_NONE, + RIG_PARM_NONE, RIG_PARM_NONE, /* FIXME: parms */ + NULL, NULL, /* FIXME: CTCSS/DCS list */ { RIG_DBLST_END, }, /* FIXME! */ { RIG_DBLST_END, }, 9999, @@ -196,6 +198,8 @@ const struct rig_caps ft847_caps = { 1, RIG_TRN_OFF, 78, 0, 0, + { RIG_CHAN_END, }, /* FIXME: memory chan list */ + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, { {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */