diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index 457813981..7e3f307f6 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -2,7 +2,7 @@ * Hamlib Interface - list of known rigs * Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton * - * $Id: riglist.h,v 1.32 2003-02-09 22:50:52 fillods Exp $ + * $Id: riglist.h,v 1.33 2003-03-15 23:58:41 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -108,6 +108,7 @@ #define RIG_MODEL_THF6A RIG_MAKE_MODEL(RIG_KENWOOD, 19) #define RIG_MODEL_THF7E RIG_MAKE_MODEL(RIG_KENWOOD, 20) #define RIG_MODEL_K2 RIG_MAKE_MODEL(RIG_KENWOOD, 21) +#define RIG_MODEL_TS930 RIG_MAKE_MODEL(RIG_KENWOOD, 22) /* * Icom @@ -351,7 +352,8 @@ #define RIG_BACKEND_GNURADIO "gnuradio" #define RIG_MODEL_GNURADIO RIG_MAKE_MODEL(RIG_GNURADIO, 1) /* dev model, Chirp source */ #define RIG_MODEL_MC4020 RIG_MAKE_MODEL(RIG_GNURADIO, 2) /* MC4020 */ -#define RIG_MODEL_GRAUDIO RIG_MAKE_MODEL(RIG_GNURADIO, 3) /* Source card source */ +#define RIG_MODEL_GRAUDIO RIG_MAKE_MODEL(RIG_GNURADIO, 3) /* Sound card source */ +#define RIG_MODEL_GRAUDIOIQ RIG_MAKE_MODEL(RIG_GNURADIO, 4) /* I&Q stereo sound card source */ /* * Microtune tuners diff --git a/kenwood/Makefile.am b/kenwood/Makefile.am index 0e4526b52..c3aea735c 100644 --- a/kenwood/Makefile.am +++ b/kenwood/Makefile.am @@ -1,6 +1,6 @@ TSSRCLIST = ts850.c ts870s.c ts570.c ts450s.c ts440.c ts950.c ts50s.c \ - ts790.c thd7.c thf7.c ts2000.c k2.c + ts790.c thd7.c thf7.c ts2000.c k2.c ts930.c lib_LTLIBRARIES = hamlib-kenwood.la hamlib_kenwood_la_SOURCES = $(TSSRCLIST) kenwood.c th.c diff --git a/kenwood/kenwood.c b/kenwood/kenwood.c index 18d750b5c..442e19e8a 100644 --- a/kenwood/kenwood.c +++ b/kenwood/kenwood.c @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - main file * Copyright (c) 2000-2003 by Stephane Fillod and others * - * $Id: kenwood.c,v 1.58 2003-03-10 08:26:09 fillods Exp $ + * $Id: kenwood.c,v 1.59 2003-03-15 23:58:40 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -1320,9 +1320,9 @@ const char* kenwood_get_info(RIG *rig) rig_model_t probeallrigs_kenwood(port_t *port, rig_probe_func_t cfunc, rig_ptr_t data) { unsigned char idbuf[IDBUFSZ]; - int id_len, i, k_id; - int retval; - int rates[] = { 57600, 9600, 4800, 0 }; /* possible baud rates */ + int id_len=-1, i, k_id; + int retval=-1; + int rates[] = { 57600, 9600, 4800, 1200, 0 }; /* possible baud rates */ int rates_idx; if (!port) @@ -1496,6 +1496,7 @@ int initrigs_kenwood(void *be_handle) rig_register(&ts790_caps); rig_register(&ts850_caps); rig_register(&ts870s_caps); + rig_register(&ts930_caps); rig_register(&ts2000_caps); rig_register(&k2_caps); diff --git a/kenwood/kenwood.h b/kenwood/kenwood.h index 420ee16bc..81345339d 100644 --- a/kenwood/kenwood.h +++ b/kenwood/kenwood.h @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - main header * Copyright (c) 2000-2002 by Stephane Fillod * - * $Id: kenwood.h,v 1.27 2003-03-10 08:26:09 fillods Exp $ + * $Id: kenwood.h,v 1.28 2003-03-15 23:58:41 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -89,6 +89,7 @@ extern const struct rig_caps ts570s_caps; extern const struct rig_caps ts790_caps; extern const struct rig_caps ts850_caps; extern const struct rig_caps ts870s_caps; +extern const struct rig_caps ts930_caps; extern const struct rig_caps ts2000_caps; extern const struct rig_caps thd7a_caps; extern const struct rig_caps thf7a_caps; diff --git a/kenwood/ts930.c b/kenwood/ts930.c new file mode 100644 index 000000000..15d6829c9 --- /dev/null +++ b/kenwood/ts930.c @@ -0,0 +1,174 @@ +/* + * Hamlib Kenwood backend - TS930 description + * Copyright (c) 2000-2003 by Stephane Fillod + * + * $Id: ts930.c,v 1.1 2003-03-15 23:58:41 fillods Exp $ + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include "kenwood.h" + + +#define TS930_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY) +#define TS930_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY) +#define TS930_AM_TX_MODES RIG_MODE_AM + +/* FIXME: TBC */ +#define TS930_FUNC_ALL (RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_NR|RIG_FUNC_ANF|RIG_FUNC_LOCK) + +#define TS930_LEVEL_ALL (RIG_LEVEL_ATT|RIG_LEVEL_SQL|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_AGC) + +#define TS930_VFO (RIG_VFO_A|RIG_VFO_B) +#define TS930_ANTS (0) + +static const struct kenwood_priv_caps ts930_priv_caps = { + .cmdtrm = EOM_KEN, +}; + +/* + * ts930 rig capabilities. + * Notice that some rigs share the same functions. + * Also this struct is READONLY! + * + * part of infos comes from .http = //www.kenwood.net/ + */ +const struct rig_caps ts930_caps = { +.rig_model = RIG_MODEL_TS930, +.model_name = "TS-930", +.mfg_name = "Kenwood", +.version = "0.2", +.copyright = "LGPL", +.status = RIG_STATUS_UNTESTED, +.rig_type = RIG_TYPE_TRANSCEIVER, +.ptt_type = RIG_PTT_RIG, +.dcd_type = RIG_DCD_RIG, +.port_type = RIG_PORT_SERIAL, +.serial_rate_min = 1200, +.serial_rate_max = 57600, +.serial_data_bits = 8, +.serial_stop_bits = 1, +.serial_parity = RIG_PARITY_NONE, +.serial_handshake = RIG_HANDSHAKE_NONE, +.write_delay = 0, +.post_write_delay = 0, +.timeout = 200, +.retry = 3, + +.has_get_func = TS930_FUNC_ALL, +.has_set_func = TS930_FUNC_ALL, +.has_get_level = TS930_LEVEL_ALL, +.has_set_level = RIG_LEVEL_SET(TS930_LEVEL_ALL), +.has_get_parm = RIG_PARM_NONE, +.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ +.level_gran = {}, /* FIXME: granularity */ +.parm_gran = {}, +.preamp = { RIG_DBLST_END, }, /* FIXME: preamp list */ +.attenuator = { 6, 12, 18, RIG_DBLST_END, }, /* TBC */ +.max_rit = kHz(9.99), +.max_xit = kHz(9.99), +.max_ifshift = Hz(0), +.targetable_vfo = RIG_TARGETABLE_FREQ, +.transceive = RIG_TRN_RIG, +.bank_qty = 0, +.chan_desc_sz = 0, + + +.chan_list = { + { 0, 89, RIG_MTYPE_MEM }, /* TBC */ + { 90, 99, RIG_MTYPE_EDGE }, + RIG_CHAN_END, + }, + +.rx_range_list1 = { + {kHz(150),MHz(30),TS930_ALL_MODES,-1,-1,TS930_VFO}, + RIG_FRNG_END, + }, /* rx range */ +.tx_range_list1 = { + FRQ_RNG_HF(1,TS930_OTHER_TX_MODES, W(5),W(250),TS930_VFO,TS930_ANTS), + FRQ_RNG_HF(1,TS930_AM_TX_MODES, W(4),W(80),TS930_VFO,TS930_ANTS), /* AM class */ + RIG_FRNG_END, + }, + +.rx_range_list2 = { + {kHz(150),MHz(30),TS930_ALL_MODES,-1,-1,TS930_VFO}, + RIG_FRNG_END, + }, /* rx range */ +.tx_range_list2 = { + FRQ_RNG_HF(1,TS930_OTHER_TX_MODES, W(5),W(250),TS930_VFO,TS930_ANTS), + FRQ_RNG_HF(1,TS930_AM_TX_MODES, W(4),W(80),TS930_VFO,TS930_ANTS), /* AM class */ + RIG_FRNG_END, + }, /* tx range */ +.tuning_steps = { /* FIXME: TBC */ + {TS930_ALL_MODES,50}, + {TS930_ALL_MODES,100}, + {TS930_ALL_MODES,kHz(1)}, + {TS930_ALL_MODES,kHz(5)}, + {TS930_ALL_MODES,kHz(9)}, + {TS930_ALL_MODES,kHz(10)}, + {TS930_ALL_MODES,12500}, + {TS930_ALL_MODES,kHz(20)}, + {TS930_ALL_MODES,kHz(25)}, + {TS930_ALL_MODES,kHz(100)}, + {TS930_ALL_MODES,MHz(1)}, + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ +.filters = { + {RIG_MODE_AM, kHz(6)}, + {RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_RTTY|RIG_MODE_AM, kHz(2.7)}, + RIG_FLT_END, + }, +.priv = (void *)&ts930_priv_caps, + +.set_freq = kenwood_set_freq, +.get_freq = kenwood_get_freq, +.set_rit = kenwood_set_rit, +.get_rit = kenwood_get_rit, +.set_xit = kenwood_set_xit, +.get_xit = kenwood_get_xit, +.set_mode = kenwood_set_mode, +.get_mode = kenwood_get_mode, +.set_vfo = kenwood_set_vfo, +.get_vfo = kenwood_get_vfo, +.get_ptt = kenwood_get_ptt, +.set_ptt = kenwood_set_ptt, +.get_dcd = kenwood_get_dcd, +.set_func = kenwood_set_func, +.get_func = kenwood_get_func, +.set_level = kenwood_set_level, +.get_level = kenwood_get_level, +.vfo_op = kenwood_vfo_op, +.set_mem = kenwood_set_mem, +.get_mem = kenwood_get_mem, +.set_trn = kenwood_set_trn, +.get_trn = kenwood_get_trn, +.set_powerstat = kenwood_set_powerstat, +.get_powerstat = kenwood_get_powerstat, +.reset = kenwood_reset, + +}; + +/* + * Function definitions below + */ +