From 351e4f33b95cd407e5162a226a685f4560785d07 Mon Sep 17 00:00:00 2001 From: Robin Olejnik Date: Tue, 29 Mar 2016 00:05:38 +0200 Subject: [PATCH] Added support for Icom IC-2730 --- icom/Android.mk | 2 +- icom/Makefile.am | 2 +- icom/ic2730.c | 205 +++++++++++++++++++++++++++++++++++++++ icom/icom.c | 2 +- icom/icom.h | 1 + include/hamlib/riglist.h | 3 +- 6 files changed, 211 insertions(+), 4 deletions(-) create mode 100644 icom/ic2730.c diff --git a/icom/Android.mk b/icom/Android.mk index b1404401b..f1f972a6a 100644 --- a/icom/Android.mk +++ b/icom/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := ic706.c icr8500.c ic735.c ic775.c ic756.c \ ic736.c ic738.c ic7410.c ic746.c ic703.c ic726.c ic271.c \ ic765.c ic781.c ic471.c icr9000.c icr9500.c \ icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \ - id1.c id5100.c \ + id1.c id5100.c ic2730.c \ ic707.c ic728.c ic751.c ic761.c \ ic78.c ic7800.c ic7000.c ic7100.c ic7200.c ic7600.c ic7700.c \ icom.c frame.c optoscan.c diff --git a/icom/Makefile.am b/icom/Makefile.am index d4fcf9480..079879a80 100644 --- a/icom/Makefile.am +++ b/icom/Makefile.am @@ -5,7 +5,7 @@ ICOMSRC = ic706.c icr8500.c ic735.c ic775.c ic756.c \ ic736.c ic738.c ic7410.c ic746.c ic703.c ic726.c ic271.c \ ic765.c ic781.c ic471.c icr9000.c icr9500.c \ icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \ - id1.c id5100.c \ + id1.c id5100.c ic2730.c \ ic707.c ic728.c ic751.c ic761.c \ ic78.c ic7800.c ic7000.c ic7100.c ic7200.c ic7600.c ic7700.c \ icom.c icom.h icom_defs.h frame.c frame.h optoscan.c optoscan.h diff --git a/icom/ic2730.c b/icom/ic2730.c new file mode 100644 index 000000000..97ee6f0af --- /dev/null +++ b/icom/ic2730.c @@ -0,0 +1,205 @@ +/* + * Hamlib CI-V backend - description of IC-2730 and variations + * Copyright (c) 2015 by Stephane Fillod + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +#include "hamlib/rig.h" +#include "idx_builtin.h" +#include "icom.h" + +#define IC2730_MODES (RIG_MODE_FM) +#define IC2730_ALL_RX_MODES (RIG_MODE_AM|IC2730_MODES) + +#define IC2730_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB) + +#define IC2730_SCAN_OPS RIG_SCAN_NONE + +#define IC2730_VFO_OPS RIG_OP_NONE + +#define IC2730_FUNC_ALL ( \ + RIG_FUNC_TONE| \ + RIG_FUNC_TSQL| \ + RIG_FUNC_VOX) + +#define IC2730_LEVEL_ALL (RIG_LEVEL_AF| \ + RIG_LEVEL_SQL| \ + RIG_LEVEL_RFPOWER| \ + RIG_LEVEL_MICGAIN| \ + RIG_LEVEL_VOXGAIN) + +#define IC2730_PARM_ALL RIG_PARM_NONE + + +/* + * FIXME: real measurement + */ +#define IC2730_STR_CAL UNKNOWN_IC_STR_CAL + +static const struct icom_priv_caps ic2730_priv_caps = { + 0x90, /* default address */ + 0, /* 731 mode */ + 1, /* no XCHG */ +}; + +const struct rig_caps ic2730_caps = { +.rig_model = RIG_MODEL_IC2730, +.model_name = "IC-2730", +.mfg_name = "Icom", +.version = BACKEND_VER, +.copyright = "LGPL", +.status = RIG_STATUS_UNTESTED, +.rig_type = RIG_TYPE_MOBILE, +.ptt_type = RIG_PTT_RIG, +.dcd_type = RIG_DCD_RIG, +.port_type = RIG_PORT_SERIAL, +.serial_rate_min = 4800, +.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 = 1000, +.retry = 3, +.has_get_func = IC2730_FUNC_ALL, +.has_set_func = IC2730_FUNC_ALL, +.has_get_level = IC2730_LEVEL_ALL, +.has_set_level = RIG_LEVEL_SET(IC2730_LEVEL_ALL), +.has_get_parm = IC2730_PARM_ALL, +.has_set_parm = IC2730_PARM_ALL, +.level_gran = { + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, +}, +.parm_gran = {}, +.ctcss_list = common_ctcss_list, +.dcs_list = full_dcs_list, +.preamp = { RIG_DBLST_END, }, +.attenuator = { RIG_DBLST_END, }, +.max_rit = Hz(0), +.max_xit = Hz(0), +.max_ifshift = Hz(0), +.targetable_vfo = 0, +.vfo_ops = IC2730_VFO_OPS, +.scan_ops = IC2730_SCAN_OPS, +.transceive = RIG_TRN_RIG, +.bank_qty = 0, +.chan_desc_sz = 0, + +.chan_list = { + // There's no memory support through CI-V, + // but there is a clone mode apart. + RIG_CHAN_END, + }, + +.rx_range_list1 = { + {MHz(118),MHz(174),IC2730_ALL_RX_MODES,-1,-1,IC2730_VFO_ALL}, + {MHz(375),MHz(550),IC2730_ALL_RX_MODES,-1,-1,IC2730_VFO_ALL}, + RIG_FRNG_END, }, +.tx_range_list1 = { + {MHz(144),MHz(146),IC2730_MODES,W(5),W(25),IC2730_VFO_ALL}, + {MHz(430),MHz(440),IC2730_MODES,W(5),W(25),IC2730_VFO_ALL}, + RIG_FRNG_END, }, + +.rx_range_list2 = { + {MHz(118),MHz(174),IC2730_ALL_RX_MODES,-1,-1,IC2730_VFO_ALL}, + {MHz(375),MHz(550),IC2730_ALL_RX_MODES,-1,-1,IC2730_VFO_ALL}, + RIG_FRNG_END, }, +.tx_range_list2 = { + {MHz(144),MHz(148),IC2730_MODES,W(5),W(50),IC2730_VFO_ALL}, + {MHz(430),MHz(450),IC2730_MODES,W(5),W(50),IC2730_VFO_ALL}, + RIG_FRNG_END, }, + +.tuning_steps = { + // Rem: no support for changing tuning step + {IC2730_ALL_RX_MODES,kHz(5)}, + {IC2730_ALL_RX_MODES,kHz(6.25)}, + // The 8.33 kHz step is not selectable, depending on the operating band or mode. + {IC2730_ALL_RX_MODES,kHz(8.33)}, + {IC2730_ALL_RX_MODES,kHz(10)}, + {IC2730_ALL_RX_MODES,12500}, + {IC2730_ALL_RX_MODES,kHz(15)}, + {IC2730_ALL_RX_MODES,kHz(20)}, + {IC2730_ALL_RX_MODES,kHz(25)}, + {IC2730_ALL_RX_MODES,kHz(30)}, + {IC2730_ALL_RX_MODES,kHz(50)}, + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ +.filters = { + {RIG_MODE_FM|RIG_MODE_AM, kHz(12)}, + {RIG_MODE_FM|RIG_MODE_AM, kHz(6)}, + RIG_FLT_END, + }, +.str_cal = IC2730_STR_CAL, + +.cfgparams = icom_cfg_params, +.set_conf = icom_set_conf, +.get_conf = icom_get_conf, + +.priv = (void*)&ic2730_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_powerstat = icom_set_powerstat, +.get_powerstat = icom_get_powerstat, +.decode_event = icom_decode_event, + +.set_func = icom_set_func, +.get_func = icom_get_func, +.set_level = icom_set_level, +.get_level = icom_get_level, + +.set_ptt = icom_set_ptt, +.get_ptt = icom_get_ptt, +.get_dcd = icom_get_dcd, + +.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_split_vfo = icom_set_split_vfo, +.get_split_vfo = icom_get_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, + +}; diff --git a/icom/icom.c b/icom/icom.c index 0e7180967..0ee773083 100644 --- a/icom/icom.c +++ b/icom/icom.c @@ -3374,7 +3374,7 @@ DECLARE_INITRIG_BACKEND(icom) rig_register(&ic92d_caps); rig_register(&id1_caps); rig_register(&id5100_caps); + rig_register(&ic2730_caps); return RIG_OK; } - diff --git a/icom/icom.h b/icom/icom.h index 375ccb523..f5a1cb45c 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -256,5 +256,6 @@ extern const struct rig_caps os535_caps; extern const struct rig_caps ic92d_caps; extern const struct rig_caps id1_caps; extern const struct rig_caps id5100_caps; +extern const struct rig_caps ic2730_caps; #endif /* _ICOM_H */ diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index fa7fb23f2..b34915f7a 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -211,7 +211,8 @@ #define RIG_MODEL_ICRX7 RIG_MAKE_MODEL(RIG_ICOM, 69) #define RIG_MODEL_IC7100 RIG_MAKE_MODEL(RIG_ICOM, 70) #define RIG_MODEL_ID5100 RIG_MAKE_MODEL(RIG_ICOM, 71) -/* next one is 72 */ +#define RIG_MODEL_IC2730 RIG_MAKE_MODEL(RIG_ICOM, 72) +/* next one is 73 */ /* * Optoelectronics (CI-V)