From e9ee671149ad41a4fe000a40414d9d6ee12c60a4 Mon Sep 17 00:00:00 2001 From: mvcstroomer Date: Sat, 19 Oct 2013 19:41:21 +0100 Subject: [PATCH] Add Icom IC-7100 support. From Martin, CT1IQI: "Several programs under Linux rely on Hamlib for control. I wanted to try WSJT-X (digital modes like JT65) and found that my new IC-7100 was not yet supported, also after having compiled the current git version of Hamlib and having compiled WSJT-X against that. So I added a IC-7100 by taking the ic-7200 and 7420 rig files as example, be it without going (yet) through all of the very many commands the ic-7100 supports. This produced the situation where there was communication, e.g. setting and reading frequencies, but the PTT control did not work. I debugged that to actually the lack of a PTT mode in Hamlib that uses serial and CAT at the same time; currently PTT per 'serial' seems equivalent to toggling certain RS232 pins but not to any serial command level. So I added a RIG_PTT_SERIAL_CAT mode for PTT control. Now the wsjt-x program works nicely with the ic-7100 and controls both frequency and PTT via the single USB cable." Signed-off-by: Nate Bargmann --- icom/Android.mk | 2 +- icom/Makefile.am | 2 +- icom/ic7100.c | 271 +++++++++++++++++++++++++++++++++++++++ icom/icom.c | 20 +++ icom/icom.h | 2 + include/hamlib/rig.h | 3 +- include/hamlib/riglist.h | 3 +- src/rig.c | 9 +- 8 files changed, 307 insertions(+), 5 deletions(-) create mode 100644 icom/ic7100.c diff --git a/icom/Android.mk b/icom/Android.mk index c5fc6c63d..1351f76d8 100644 --- a/icom/Android.mk +++ b/icom/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := ic706.c icr8500.c ic735.c ic775.c ic756.c \ ic765.c ic781.c ic471.c id1.c icr9000.c icr9500.c \ icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \ ic707.c ic728.c ic751.c ic761.c \ - ic78.c ic7800.c ic7000.c ic7200.c ic7600.c ic7700.c \ + ic78.c ic7800.c ic7000.c ic7100.c ic7200.c ic7600.c ic7700.c \ icom.c frame.c optoscan.c LOCAL_MODULE := icom diff --git a/icom/Makefile.am b/icom/Makefile.am index 4f9352b71..3b88317e3 100644 --- a/icom/Makefile.am +++ b/icom/Makefile.am @@ -6,7 +6,7 @@ ICOMSRC = ic706.c icr8500.c ic735.c ic775.c ic756.c \ ic765.c ic781.c ic471.c id1.c icr9000.c icr9500.c \ icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \ ic707.c ic728.c ic751.c ic761.c \ - ic78.c ic7800.c ic7000.c ic7200.c ic7600.c ic7700.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 noinst_LTLIBRARIES = libhamlib-icom.la diff --git a/icom/ic7100.c b/icom/ic7100.c new file mode 100644 index 000000000..57d48ac0f --- /dev/null +++ b/icom/ic7100.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 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 +#include "icom.h" +#include "icom_defs.h" +#include "frame.h" +#include "idx_builtin.h" +#include "bandplan.h" + + +#define IC7100_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_CWR|\ + RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR) + +#define IC7100_OTHER_TX_MODES ((IC7100_MODES) & ~RIG_MODE_AM) + +#define IC7100_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) + +#define IC7100_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_SLCT|RIG_SCAN_PRIO) + +#define IC7100_VFO_OPS (RIG_OP_FROM_VFO| \ + RIG_OP_TO_VFO| \ + RIG_OP_CPY| \ + RIG_OP_MCL| \ + RIG_OP_XCHG| \ + RIG_OP_TUNE) + +#define IC7100_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 IC7100_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 IC7100_PARM_ALL (RIG_PARM_ANN|RIG_PARM_BACKLIGHT) + +#define IC7100_STR_CAL UNKNOWN_IC_STR_CAL /* FIXME */ + +#define IC7100_HF_ANTS (RIG_ANT_1|RIG_ANT_2) + +/* + */ +static const struct icom_priv_caps ic7100_priv_caps = { + 0x88, /* default address */ + 0, /* 731 mode */ + ic7100_ts_sc_list, /* FIXME */ +}; + +const struct rig_caps ic7100_caps = { +.rig_model = RIG_MODEL_IC7100, +.model_name = "IC-7100", +.mfg_name = "Icom", +.version = BACKEND_VER, +.copyright = "LGPL", +.status = RIG_STATUS_UNTESTED, +.rig_type = RIG_TYPE_TRANSCEIVER, +.ptt_type = RIG_PTT_SERIAL_CAT, +.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 = IC7100_FUNC_ALL, +.has_set_func = IC7100_FUNC_ALL | RIG_FUNC_RESUME, +.has_get_level = IC7100_LEVEL_ALL | RIG_LEVEL_RAWSTR| RIG_LEVEL_SWR, +.has_set_level = IC7100_LEVEL_ALL, +.has_get_parm = IC7100_PARM_ALL, +.has_set_parm = IC7100_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 = IC7100_VFO_OPS, +.scan_ops = IC7100_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),IC7100_MODES,-1,-1,IC7100_VFO_ALL,IC7100_HF_ANTS}, + {kHz(136),MHz(174),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_3}, + {MHz(420),MHz(480),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_4}, + {MHz(1240),MHz(1320),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_5}, + RIG_FRNG_END, }, +.tx_range_list1 = { + FRQ_RNG_HF(1,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS), + FRQ_RNG_HF(1,RIG_MODE_AM, W(2),W(25),IC7100_VFO_ALL,IC7100_HF_ANTS), /* only HF */ + FRQ_RNG_6m(1,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS), + FRQ_RNG_2m(1,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,RIG_ANT_3), + FRQ_RNG_70cm(1,IC7100_OTHER_TX_MODES, W(2),W(75),IC7100_VFO_ALL,RIG_ANT_4), + /* option */ + FRQ_RNG_23cm_REGION1(IC7100_OTHER_TX_MODES, W(1),W(10),IC7100_VFO_ALL,RIG_ANT_5), + RIG_FRNG_END, }, + +.rx_range_list2 = { /* USA */ + {kHz(30),MHz(60),IC7100_MODES,-1,-1,IC7100_VFO_ALL,IC7100_HF_ANTS}, + {kHz(136),MHz(174),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_3}, + {MHz(420),MHz(480),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_4}, + {MHz(1240),MHz(1320),IC7100_MODES,-1,-1,IC7100_VFO_ALL,RIG_ANT_5}, + RIG_FRNG_END, }, +.tx_range_list2 = { + FRQ_RNG_HF(2,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS), + FRQ_RNG_HF(2,RIG_MODE_AM, W(2),W(25),IC7100_VFO_ALL,IC7100_HF_ANTS), /* only HF */ + /* USA only, TBC: end of range and modes */ + {MHz(5.255),MHz(5.405),IC7100_OTHER_TX_MODES,W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS}, /* USA only */ + {MHz(5.255),MHz(5.405),RIG_MODE_AM,W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS}, /* USA only */ + FRQ_RNG_6m(2,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,IC7100_HF_ANTS), + FRQ_RNG_2m(2,IC7100_OTHER_TX_MODES, W(2),W(100),IC7100_VFO_ALL,RIG_ANT_3), + FRQ_RNG_70cm(2,IC7100_OTHER_TX_MODES, W(2),W(75),IC7100_VFO_ALL,RIG_ANT_4), + /* option */ + FRQ_RNG_23cm_REGION2(IC7100_OTHER_TX_MODES, W(1),W(10),IC7100_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 = IC7100_STR_CAL, + +.priv = (void*)&ic7100_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 44ad3c8c5..82b9d81c4 100644 --- a/icom/icom.c +++ b/icom/icom.c @@ -193,6 +193,23 @@ const struct ts_sc_list ic7000_ts_sc_list[] = { { 0, 0 }, }; +const struct ts_sc_list ic7100_ts_sc_list[] = { + { 10, 0x00 }, + { 100, 0x01 }, + { kHz(1), 0x02 }, + { kHz(5), 0x03 }, + { kHz(6.25), 0x04 }, + { kHz(9), 0x05 }, + { kHz(10), 0x06 }, + { kHz(12.5), 0x07 }, + { kHz(20), 0x08 }, + { kHz(25), 0x09 }, + { kHz(50), 0x0A }, + { kHz(100), 0x0B }, + { MHz(1), 0x0C }, + { 0, 0x00 }, +}; + const struct ts_sc_list ic7200_ts_sc_list[] = { { 10, 0x00 }, { 100, 0x01 }, @@ -315,6 +332,7 @@ static const struct icom_addr icom_addr_list[] = { { RIG_MODEL_OS535, 0x80 }, /* same address as IC-7410 */ { RIG_MODEL_ICID1, 0x01 }, { RIG_MODEL_IC7000, 0x70 }, + { RIG_MODEL_IC7100, 0x88 }, { RIG_MODEL_IC7200, 0x76 }, { RIG_MODEL_IC7700, 0x74 }, { RIG_MODEL_NONE, 0 }, @@ -1403,6 +1421,7 @@ int icom_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) retval = icom_transaction (rig, C_CTL_PTT, S_PTT, NULL, 0, pttbuf, &ptt_len); + if (retval != RIG_OK) return retval; @@ -3266,6 +3285,7 @@ DECLARE_INITRIG_BACKEND(icom) rig_register(&ic78_caps); rig_register(&ic7800_caps); rig_register(&ic7000_caps); + rig_register(&ic7100_caps); rig_register(&ic7200_caps); rig_register(&ic781_caps); rig_register(&ic707_caps); diff --git a/icom/icom.h b/icom/icom.h index 82d0ff4fe..a5c648528 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -129,6 +129,7 @@ extern const struct ts_sc_list ic756_ts_sc_list[]; extern const struct ts_sc_list ic756pro_ts_sc_list[]; extern const struct ts_sc_list ic706_ts_sc_list[]; extern const struct ts_sc_list ic7000_ts_sc_list[]; +extern const struct ts_sc_list ic7100_ts_sc_list[]; extern const struct ts_sc_list ic7200_ts_sc_list[]; extern const struct ts_sc_list ic910_ts_sc_list[]; extern const struct ts_sc_list ic718_ts_sc_list[]; @@ -218,6 +219,7 @@ extern const struct rig_caps ic775_caps; extern const struct rig_caps ic78_caps; extern const struct rig_caps ic7800_caps; extern const struct rig_caps ic7000_caps; +extern const struct rig_caps ic7100_caps; extern const struct rig_caps ic7200_caps; extern const struct rig_caps ic781_caps; extern const struct rig_caps ic820h_caps; diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 02cf599ae..67313625b 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -418,7 +418,8 @@ typedef enum { RIG_PTT_SERIAL_RTS, /*!< PTT control through serial RTS signal */ RIG_PTT_PARALLEL, /*!< PTT control through parallel port */ RIG_PTT_RIG_MICDATA, /*!< Legacy PTT, supports RIG_PTT_ON_MIC/RIG_PTT_ON_DATA */ - RIG_PTT_CM108 /*!< PTT control through CM108 GPIO pin */ + RIG_PTT_CM108, /*!< PTT control through CM108 GPIO pin */ + RIG_PTT_SERIAL_CAT /*!< PTT control through serial command sequence*/ } ptt_type_t; /** diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index 42d7a781f..4a5a37ca1 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -203,7 +203,8 @@ #define RIG_MODEL_IC7410 RIG_MAKE_MODEL(RIG_ICOM, 67) #define RIG_MODEL_IC9100 RIG_MAKE_MODEL(RIG_ICOM, 68) #define RIG_MODEL_ICRX7 RIG_MAKE_MODEL(RIG_ICOM, 69) -/* next one is 70 */ +#define RIG_MODEL_IC7100 RIG_MAKE_MODEL(RIG_ICOM, 70) +/* next one is 71 */ /* * Optoelectronics (CI-V) diff --git a/src/rig.c b/src/rig.c index 01f330a8b..d082e4eeb 100644 --- a/src/rig.c +++ b/src/rig.c @@ -496,6 +496,7 @@ int HAMLIB_API rig_open(RIG *rig) case RIG_PTT_NONE: case RIG_PTT_RIG: case RIG_PTT_RIG_MICDATA: + case RIG_PTT_SERIAL_CAT: break; case RIG_PTT_SERIAL_RTS: case RIG_PTT_SERIAL_DTR: @@ -675,6 +676,7 @@ int HAMLIB_API rig_close(RIG *rig) case RIG_PTT_NONE: case RIG_PTT_RIG: case RIG_PTT_RIG_MICDATA: + case RIG_PTT_SERIAL_CAT: break; case RIG_PTT_SERIAL_RTS: ser_set_rts(&rs->pttport, RIG_PTT_OFF); @@ -1207,7 +1209,6 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) return -RIG_EINVAL; caps = rig->caps; - switch (rig->state.pttport.type.ptt) { case RIG_PTT_RIG: if (ptt == RIG_PTT_ON_MIC || ptt == RIG_PTT_ON_DATA) @@ -1240,6 +1241,12 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) case RIG_PTT_SERIAL_RTS: return ser_set_rts(&rig->state.pttport, ptt!=RIG_PTT_OFF); + case RIG_PTT_SERIAL_CAT: + if (ptt == RIG_PTT_ON_MIC || ptt == RIG_PTT_ON_DATA) + ptt = RIG_PTT_ON; + retcode = caps->set_ptt(rig, vfo, ptt); + return retcode; + case RIG_PTT_PARALLEL: return par_ptt_set(&rig->state.pttport, ptt);