diff --git a/NEWS b/NEWS index eb7b890ff..4e7f03e7d 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,12 @@ Copyright (C) 2000-2011 Stephane Fillod, and others Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net +Version 1.2.14 + 2011-XX-XX + * New models: SigFox Transfox, TH-D72A, IC-7410, IC-9100 + * New rotator backends: IF-100 + * Fixes and features: K3 + Version 1.2.13.1 * 2011-05-29 * Conversion to Git SCM and updated README documentation for Git SCM @@ -15,12 +21,12 @@ Version 1.2.13.1 Version 1.2.13 2011-03-12 - * New models: VX-1700, FUNcube, FiFi-SDR, KTH-SDR Si570, FT-5000, - TS-590S + * New models: VX-1700, FUNcube Dongle, FiFi-SDR, KTH-SDR Si570, + FT-DX5000, TS-590S, TH-F6A, PRM8060, SR-2200 * Rotor fixes and features: SPID * New Rotor backend: F1TE Tracker - * Fixes and features: TS-440S, K2, K3, SR-2200, THF6A, THF7E, NewCAT - rigs serial port defaults, TM-D700, + * Fixes and features: TS-440S, K2, K3, THF6A, THF7E, NewCAT + rigs serial port defaults, TM-D700, FT-950, Si570 AVR-USB * Removed libtool tree from source tree * Removed old DocBook files * Allow USB device's VID/PID/Vendor/Product to be explicitly specified diff --git a/icom/Makefile.am b/icom/Makefile.am index f4014641f..a67c27fe5 100644 --- a/icom/Makefile.am +++ b/icom/Makefile.am @@ -1,8 +1,8 @@ ICOMSRCLIST = ic706.c icr8500.c ic735.c ic775.c ic756.c \ ic275.c ic475.c ic820h.c ic821h.c \ - icr7000.c ic910.c ic970.c ic725.c ic737.c ic718.c \ + icr7000.c ic910.c ic9100.c ic970.c ic725.c ic737.c ic718.c \ os535.c os456.c omni.c delta2.c ic92d.c \ - ic736.c ic738.c ic746.c ic703.c ic726.c ic271.c \ + ic736.c ic738.c ic7410.c ic746.c ic703.c ic726.c ic271.c \ ic765.c ic781.c ic471.c id1.c icr9000.c icr9500.c \ icr10.c icr20.c icr71.c icr72.c icr75.c \ ic707.c ic728.c ic751.c ic761.c \ diff --git a/icom/ic7410.c b/icom/ic7410.c new file mode 100644 index 000000000..ad5dafd9c --- /dev/null +++ b/icom/ic7410.c @@ -0,0 +1,233 @@ +/* + * Hamlib CI-V backend - description of IC-7410 + * Copyright (c) 2011 by Stephane Fillod + * + * + * 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 /* String function definitions */ + +#include +#include "token.h" +#include "idx_builtin.h" + +#include "icom.h" +#include "icom_defs.h" +#include "frame.h" +#include "misc.h" +#include "bandplan.h" + +/* + * TODO: PSK and PSKR + */ +#define IC7410_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) +#define IC7410_1HZ_TS_MODES IC7410_ALL_RX_MODES +#define IC7410_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) +#define IC7410_AM_TX_MODES (RIG_MODE_AM) + +#define IC7410_FUNCS (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN|RIG_FUNC_NR|RIG_FUNC_MON|RIG_FUNC_MN|RIG_FUNC_ANF|RIG_FUNC_VSC|RIG_FUNC_LOCK) + +#define IC7410_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_BALANCE|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC) + +#define IC7410_VFOS (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) +#define IC7410_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT) + +#define IC7410_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE) +#define IC7410_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO) + +#define IC7410_ANTS (RIG_ANT_1|RIG_ANT_2) + +/* + * Guess from IC7600 + */ +#define IC7410_STR_CAL { 16, \ + { \ + { 0, -54 }, /* S0 */ \ + { 124, 0 }, /* S9 */ \ + { 246, 60 } /* S9+60dB */ \ + } } + + +/* + * IC-7410 rig capabilities. + * + * TODO: complete command set (esp. the $1A bunch!) and testing.. + */ +static const struct icom_priv_caps ic7410_priv_caps = { + 0x80, /* default address */ + 0, /* 731 mode */ + ic756pro_ts_sc_list +}; + + +const struct rig_caps ic7410_caps = { +.rig_model = RIG_MODEL_IC7410, +.model_name = "IC-7410", +.mfg_name = "Icom", +.version = BACKEND_VER, +.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 = 300, +.serial_rate_max = 19200, +.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 = IC7410_FUNCS, +.has_set_func = IC7410_FUNCS, +.has_get_level = IC7410_LEVELS, +.has_set_level = RIG_LEVEL_SET(IC7410_LEVELS), +.has_get_parm = IC7410_PARMS, +.has_set_parm = RIG_PARM_SET(IC7410_PARMS), /* FIXME: parms */ +.level_gran = { + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, +}, +.parm_gran = {}, +.ctcss_list = common_ctcss_list, +.dcs_list = NULL, +.preamp = { 10, 20, RIG_DBLST_END, }, /* FIXME: TBC */ +.attenuator = { 6, 12, 18, RIG_DBLST_END, }, +.max_rit = Hz(9999), +.max_xit = Hz(9999), +.max_ifshift = Hz(0), +.targetable_vfo = 0, +.vfo_ops = IC7410_VFO_OPS, +.scan_ops = IC7410_SCAN_OPS, +.transceive = RIG_TRN_RIG, +.bank_qty = 0, +.chan_desc_sz = 0, + +.chan_list = { + { 1, 99, RIG_MTYPE_MEM }, + { 100, 101, RIG_MTYPE_EDGE }, /* two by two */ + RIG_CHAN_END, + }, + +.rx_range_list1 = { {kHz(30),MHz(60),IC7410_ALL_RX_MODES,-1,-1,IC7410_VFOS,IC7410_ANTS}, + RIG_FRNG_END, }, +.tx_range_list1 = { + FRQ_RNG_HF(1,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), + FRQ_RNG_6m(1,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), + FRQ_RNG_HF(1,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + FRQ_RNG_6m(1,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + RIG_FRNG_END, }, + +.rx_range_list2 = { {kHz(30),MHz(60),IC7410_ALL_RX_MODES,-1,-1,IC7410_VFOS,IC7410_ANTS}, + RIG_FRNG_END, }, +.tx_range_list2 = { + FRQ_RNG_HF(2,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), + FRQ_RNG_6m(2,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), + FRQ_RNG_HF(2,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + FRQ_RNG_6m(2,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + /* USA only, TBC: end of range and modes */ + {MHz(5.33050),MHz(5.33350),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ + {MHz(5.34650),MHz(5.34950),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ + {MHz(5.36650),MHz(5.36950),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ + {MHz(5.37150),MHz(5.37450),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ + {MHz(5.40350),MHz(5.40650),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ + RIG_FRNG_END, }, + +.tuning_steps = { + {IC7410_1HZ_TS_MODES,1}, + {IC7410_ALL_RX_MODES,Hz(100)}, + {IC7410_ALL_RX_MODES,kHz(1)}, + {IC7410_ALL_RX_MODES,kHz(5)}, + {IC7410_ALL_RX_MODES,kHz(9)}, + {IC7410_ALL_RX_MODES,kHz(10)}, + {IC7410_ALL_RX_MODES,kHz(12.5)}, + {IC7410_ALL_RX_MODES,kHz(20)}, + {IC7410_ALL_RX_MODES,kHz(25)}, + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ +.filters = { + {RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR, kHz(2.4)}, + {RIG_MODE_CW|RIG_MODE_CWR, Hz(500)}, + {RIG_MODE_CW|RIG_MODE_CWR, Hz(350)}, + {RIG_MODE_AM, kHz(6)}, + {RIG_MODE_AM, kHz(2.4)}, + {RIG_MODE_FM, kHz(12)}, + {RIG_MODE_FM, kHz(8)}, /* TBC */ + RIG_FLT_END, + }, +.str_cal = IC7410_STR_CAL, + +.cfgparams = icom_cfg_params, +.set_conf = icom_set_conf, +.get_conf = icom_get_conf, + +.priv = (void*)&ic7410_priv_caps, +.rig_init = icom_init, +.rig_cleanup = icom_cleanup, +.rig_open = NULL, +.rig_close = NULL, + +.set_freq = icom_set_freq, +.get_freq = icom_get_freq, +.set_mode = icom_set_mode, +.get_mode = icom_get_mode, +.set_vfo = icom_set_vfo, +.set_ant = icom_set_ant, +.get_ant = icom_get_ant, + +.set_rit = icom_set_rit, + +.decode_event = icom_decode_event, +.set_level = icom_set_level, +.get_level = icom_get_level, +.set_func = icom_set_func, +.get_func = icom_get_func, +.set_parm = icom_set_parm, +.get_parm = icom_get_parm, +.set_mem = icom_set_mem, +.vfo_op = icom_vfo_op, +.scan = icom_scan, +.set_ptt = icom_set_ptt, +.get_ptt = icom_get_ptt, +.get_dcd = icom_get_dcd, +.set_ts = icom_set_ts, +.get_ts = icom_get_ts, +.set_rptr_shift = icom_set_rptr_shift, +.get_rptr_shift = icom_get_rptr_shift, +.set_rptr_offs = icom_set_rptr_offs, +.get_rptr_offs = icom_get_rptr_offs, +.set_ctcss_tone = icom_set_ctcss_tone, +.get_ctcss_tone = icom_get_ctcss_tone, +.set_ctcss_sql = icom_set_ctcss_sql, +.get_ctcss_sql = icom_get_ctcss_sql, +.set_split_freq = icom_set_split_freq, +.get_split_freq = icom_get_split_freq, +.set_split_mode = icom_set_split_mode, +.get_split_mode = icom_get_split_mode, +.set_split_vfo = icom_set_split_vfo, +.get_split_vfo = icom_mem_get_split_vfo, + +}; + diff --git a/icom/ic9100.c b/icom/ic9100.c new file mode 100644 index 000000000..be17a6c36 --- /dev/null +++ b/icom/ic9100.c @@ -0,0 +1,271 @@ +/* + * Hamlib CI-V backend - description of IC-9100 (HF/VHF/UHF All-Mode Tranceiver) + * Copyright (c) 2000-2011 by Stephane Fillod + * + * + * 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 "icom.h" +#include "icom_defs.h" +#include "frame.h" +#include "idx_builtin.h" +#include "bandplan.h" + + +#define IC9100_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_CWR|\ + RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR) + +#define IC9100_OTHER_TX_MODES ((IC9100_MODES) & ~RIG_MODE_AM) + +#define IC9100_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) + +#define IC9100_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_SLCT|RIG_SCAN_PRIO) + +#define IC9100_VFO_OPS (RIG_OP_FROM_VFO| \ + RIG_OP_TO_VFO| \ + RIG_OP_CPY| \ + RIG_OP_MCL| \ + RIG_OP_XCHG| \ + RIG_OP_TUNE) + +#define IC9100_FUNC_ALL (RIG_FUNC_FAGC| \ + RIG_FUNC_NB| \ + RIG_FUNC_NR| \ + RIG_FUNC_ANF| \ + RIG_FUNC_TONE| \ + RIG_FUNC_TSQL| \ + RIG_FUNC_COMP| \ + RIG_FUNC_VOX| \ + RIG_FUNC_FBKIN| \ + RIG_FUNC_AFC| \ + RIG_FUNC_SATMODE| \ + RIG_FUNC_VSC| \ + RIG_FUNC_MN| \ + RIG_FUNC_LOCK| \ + RIG_FUNC_SCOPE) + +#define IC9100_LEVEL_ALL (RIG_LEVEL_AF| \ + RIG_LEVEL_RF| \ + RIG_LEVEL_SQL| \ + RIG_LEVEL_IF| \ + RIG_LEVEL_NR| \ + RIG_LEVEL_CWPITCH| \ + RIG_LEVEL_RFPOWER| \ + RIG_LEVEL_MICGAIN| \ + RIG_LEVEL_KEYSPD| \ + RIG_LEVEL_COMP| \ + RIG_LEVEL_VOXGAIN| \ + RIG_LEVEL_VOXDELAY| \ + RIG_LEVEL_ANTIVOX| \ + RIG_LEVEL_APF| \ + RIG_LEVEL_AGC| \ + RIG_LEVEL_PBT_IN| \ + RIG_LEVEL_PBT_OUT| \ + RIG_LEVEL_NOTCHF| \ + RIG_LEVEL_ATT| \ + RIG_LEVEL_PREAMP) + +#define IC9100_PARM_ALL (RIG_PARM_ANN|RIG_PARM_BACKLIGHT) + +#define IC9100_STR_CAL UNKNOWN_IC_STR_CAL /* FIXME */ + +#define IC9100_HF_ANTS (RIG_ANT_1|RIG_ANT_2) + +/* + */ +static const struct icom_priv_caps ic9100_priv_caps = { + 0x7c, /* default address */ + 0, /* 731 mode */ + ic910_ts_sc_list, /* FIXME */ +}; + +const struct rig_caps ic9100_caps = { +.rig_model = RIG_MODEL_IC9100, +.model_name = "IC-9100", +.mfg_name = "Icom", +.version = BACKEND_VER, +.copyright = "LGPL", +.status = RIG_STATUS_UNTESTED, +.rig_type = RIG_TYPE_TRANSCEIVER, +.ptt_type = RIG_PTT_NONE, +.dcd_type = RIG_DCD_RIG, +.port_type = RIG_PORT_SERIAL, +.serial_rate_min = 300, +.serial_rate_max = 19200, +.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 = IC9100_FUNC_ALL, +.has_set_func = IC9100_FUNC_ALL | RIG_FUNC_RESUME, +.has_get_level = IC9100_LEVEL_ALL | RIG_LEVEL_RAWSTR| RIG_LEVEL_SWR, +.has_set_level = IC9100_LEVEL_ALL, +.has_get_parm = IC9100_PARM_ALL, +.has_set_parm = IC9100_PARM_ALL, +.level_gran = { + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, +}, +.parm_gran = {}, +.ctcss_list = common_ctcss_list, +.dcs_list = common_dcs_list, +.preamp = {20, RIG_DBLST_END, }, +.attenuator = {20, RIG_DBLST_END, }, +.max_rit = kHz(9.999), +.max_xit = kHz(9.999), +.max_ifshift = Hz(0), +.targetable_vfo = 0, +.vfo_ops = IC9100_VFO_OPS, +.scan_ops = IC9100_SCAN_OPS, +.transceive = RIG_TRN_RIG, +.bank_qty = 0, +.chan_desc_sz = 9, /* TODO */ + +.chan_list = { /* TBC */ + { 1, 396, RIG_MTYPE_MEM }, + { 397, 400, RIG_MTYPE_CALL }, + { 401, 424, RIG_MTYPE_EDGE }, + RIG_CHAN_END, }, + +.rx_range_list1 = { /* Europe */ + {kHz(30),MHz(60),IC9100_MODES,-1,-1,IC9100_VFO_ALL,IC9100_HF_ANTS}, + {kHz(136),MHz(174),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_3}, + {MHz(420),MHz(480),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_4}, + {MHz(1240),MHz(1320),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_5}, + RIG_FRNG_END, }, +.tx_range_list1 = { + FRQ_RNG_HF(1,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS), + FRQ_RNG_HF(1,RIG_MODE_AM, W(2),W(25),IC9100_VFO_ALL,IC9100_HF_ANTS), /* only HF */ + FRQ_RNG_6m(1,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS), + FRQ_RNG_2m(1,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,RIG_ANT_3), + FRQ_RNG_70cm(1,IC9100_OTHER_TX_MODES, W(2),W(75),IC9100_VFO_ALL,RIG_ANT_4), + /* option */ + FRQ_RNG_23cm_REGION1(IC9100_OTHER_TX_MODES, W(1),W(10),IC9100_VFO_ALL,RIG_ANT_5), + RIG_FRNG_END, }, + +.rx_range_list2 = { /* USA */ + {kHz(30),MHz(60),IC9100_MODES,-1,-1,IC9100_VFO_ALL,IC9100_HF_ANTS}, + {kHz(136),MHz(174),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_3}, + {MHz(420),MHz(480),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_4}, + {MHz(1240),MHz(1320),IC9100_MODES,-1,-1,IC9100_VFO_ALL,RIG_ANT_5}, + RIG_FRNG_END, }, +.tx_range_list2 = { + FRQ_RNG_HF(2,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS), + FRQ_RNG_HF(2,RIG_MODE_AM, W(2),W(25),IC9100_VFO_ALL,IC9100_HF_ANTS), /* only HF */ + /* USA only, TBC: end of range and modes */ + {MHz(5.255),MHz(5.405),IC9100_OTHER_TX_MODES,W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS}, /* USA only */ + {MHz(5.255),MHz(5.405),RIG_MODE_AM,W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS}, /* USA only */ + FRQ_RNG_6m(2,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,IC9100_HF_ANTS), + FRQ_RNG_2m(2,IC9100_OTHER_TX_MODES, W(2),W(100),IC9100_VFO_ALL,RIG_ANT_3), + FRQ_RNG_70cm(2,IC9100_OTHER_TX_MODES, W(2),W(75),IC9100_VFO_ALL,RIG_ANT_4), + /* option */ + FRQ_RNG_23cm_REGION2(IC9100_OTHER_TX_MODES, W(1),W(10),IC9100_VFO_ALL,RIG_ANT_5), + RIG_FRNG_END, }, + +.tuning_steps = { + {RIG_MODE_SSB|RIG_MODE_CW,1}, + {RIG_MODE_SSB|RIG_MODE_CW,10}, + {RIG_MODE_SSB|RIG_MODE_CW,50}, + {RIG_MODE_SSB|RIG_MODE_CW,100}, + {RIG_MODE_FM,kHz(0.1)}, + {RIG_MODE_FM,kHz(5)}, + {RIG_MODE_FM,kHz(6.25)}, + {RIG_MODE_FM,kHz(10)}, + {RIG_MODE_FM,kHz(12.5)}, + {RIG_MODE_FM,kHz(20)}, + {RIG_MODE_FM,kHz(25)}, + {RIG_MODE_FM,kHz(100)}, + RIG_TS_END, }, + /* mode/filter list, remember: order matters! */ +.filters = { + {RIG_MODE_CW | RIG_MODE_SSB | RIG_MODE_RTTY, kHz(2.4)}, /* builtin */ + {RIG_MODE_CW | RIG_MODE_RTTY, Hz(500)}, + {RIG_MODE_FM, kHz(15)}, /* builtin */ + {RIG_MODE_FM|RIG_MODE_AM, kHz(6)}, /* builtin */ + RIG_FLT_END, }, +.str_cal = IC9100_STR_CAL, + +.priv = (void*)&ic9100_priv_caps, +.rig_init = icom_init, +.rig_cleanup = icom_cleanup, +.rig_open = NULL, +.rig_close = NULL, + +.cfgparams = icom_cfg_params, +.set_conf = icom_set_conf, +.get_conf = icom_get_conf, + +.get_freq = icom_get_freq, +.set_freq = icom_set_freq, + +.get_mode = icom_get_mode, +.set_mode = icom_set_mode, + +.get_vfo = NULL, +.set_vfo = icom_set_vfo, +.set_ant = icom_set_ant, +.get_ant = icom_get_ant, +.get_ts = icom_get_ts, +.set_ts = icom_set_ts, +.get_func = icom_get_func, +.set_func = icom_set_func, +.get_level = icom_get_level, +.set_level = icom_set_level, + +.set_ptt = icom_set_ptt, +.get_ptt = icom_get_ptt, + +.set_rit = icom_set_rit, + +.set_rptr_shift = icom_set_rptr_shift, +.get_rptr_shift = icom_get_rptr_shift, +.set_rptr_offs = icom_set_rptr_offs, +.get_rptr_offs = icom_get_rptr_offs, +.set_ctcss_tone = icom_set_ctcss_tone, +.get_ctcss_tone = icom_get_ctcss_tone, +.set_ctcss_sql = icom_set_ctcss_sql, +.get_ctcss_sql = icom_get_ctcss_sql, +.set_dcs_sql = icom_set_dcs_code, +.get_dcs_sql = icom_get_dcs_code, + +.set_parm = icom_set_parm, +.get_parm = icom_get_parm, + +.set_mem = icom_set_mem, +.vfo_op = icom_vfo_op, +.scan = icom_scan, +.get_dcd = icom_get_dcd, +.decode_event = icom_decode_event, +.set_split_vfo = icom_set_split_vfo, +.set_split_freq = icom_set_split_freq, +.get_split_freq = icom_get_split_freq, +.set_split_mode = icom_set_split_mode, +.get_split_mode = icom_get_split_mode, + +}; + +/* end of file */ diff --git a/icom/icom.c b/icom/icom.c index 3f7e261f1..95bb3faea 100644 --- a/icom/icom.c +++ b/icom/icom.c @@ -1,6 +1,6 @@ /* * Hamlib CI-V backend - main file - * Copyright (c) 2000-2010 by Stephane Fillod + * Copyright (c) 2000-2011 by Stephane Fillod * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -274,6 +274,7 @@ static const struct icom_addr icom_addr_list[] = { { RIG_MODEL_IC731, 0x02 }, /* need confirmation */ { RIG_MODEL_IC735, 0x04 }, { RIG_MODEL_IC736, 0x40 }, + { RIG_MODEL_IC7410, 0x80 }, { RIG_MODEL_IC746, 0x56 }, { RIG_MODEL_IC746PRO, 0x66 }, { RIG_MODEL_IC737, 0x3c }, @@ -294,6 +295,7 @@ static const struct icom_addr icom_addr_list[] = { { RIG_MODEL_IC821, 0x4c }, { RIG_MODEL_IC821H, 0x4c }, { RIG_MODEL_IC910, 0x60 }, + { RIG_MODEL_IC9100, 0x7c }, { RIG_MODEL_IC970, 0x2e }, { RIG_MODEL_IC1271, 0x24 }, { RIG_MODEL_IC1275, 0x18 }, @@ -310,7 +312,7 @@ static const struct icom_addr icom_addr_list[] = { { RIG_MODEL_ICR9500, 0x72 }, { RIG_MODEL_MINISCOUT, 0x94 }, { RIG_MODEL_IC718, 0x5e }, - { RIG_MODEL_OS535, 0x80 }, + { RIG_MODEL_OS535, 0x80 }, /* same address as IC-7410 */ { RIG_MODEL_ICID1, 0x01 }, { RIG_MODEL_IC7000, 0x70 }, { RIG_MODEL_IC7200, 0x76 }, @@ -3150,6 +3152,7 @@ DECLARE_INITRIG_BACKEND(icom) rig_register(&ic736_caps); rig_register(&ic737_caps); rig_register(&ic738_caps); + rig_register(&ic7410_caps); rig_register(&ic746_caps); rig_register(&ic746pro_caps); rig_register(&ic751_caps); @@ -3173,6 +3176,7 @@ DECLARE_INITRIG_BACKEND(icom) rig_register(&ic820h_caps); rig_register(&ic821h_caps); rig_register(&ic910_caps); + rig_register(&ic9100_caps); rig_register(&ic970_caps); rig_register(&icr10_caps); diff --git a/icom/icom.h b/icom/icom.h index fcfb80beb..c994afc9f 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -1,6 +1,6 @@ /* * Hamlib CI-V backend - main header - * Copyright (c) 2000-2010 by Stephane Fillod + * Copyright (c) 2000-2011 by Stephane Fillod * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -200,6 +200,7 @@ extern const struct rig_caps ic736_caps; extern const struct rig_caps ic737_caps; extern const struct rig_caps ic738_caps; extern const struct rig_caps ic746_caps; +extern const struct rig_caps ic7410_caps; extern const struct rig_caps ic746pro_caps; extern const struct rig_caps ic756_caps; extern const struct rig_caps ic756pro_caps; @@ -219,6 +220,7 @@ extern const struct rig_caps ic781_caps; extern const struct rig_caps ic820h_caps; extern const struct rig_caps ic821h_caps; extern const struct rig_caps ic910_caps; +extern const struct rig_caps ic9100_caps; extern const struct rig_caps ic970_caps; extern const struct rig_caps icr10_caps; extern const struct rig_caps icr20_caps; diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index 62b7e212a..30df3e2a9 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -198,7 +198,9 @@ #define RIG_MODEL_IC7600 RIG_MAKE_MODEL(RIG_ICOM, 63) #define RIG_MODEL_IC92D RIG_MAKE_MODEL(RIG_ICOM, 65) #define RIG_MODEL_ICR9500 RIG_MAKE_MODEL(RIG_ICOM, 66) -/* next one is 67 */ +#define RIG_MODEL_IC7410 RIG_MAKE_MODEL(RIG_ICOM, 67) +#define RIG_MODEL_IC9100 RIG_MAKE_MODEL(RIG_ICOM, 68) +/* next one is 69 */ /* * Optoelectronics (CI-V)