Merger 7850/51 into 785x

astyle-formatting
Michael Black 2017-01-02 10:20:20 -06:00
rodzic ae99b17598
commit 3bad75106e
6 zmienionych plików z 57 dodań i 297 usunięć

Wyświetl plik

@ -7,7 +7,7 @@ ICOMSRC = ic706.c icr8500.c ic735.c ic775.c ic756.c \
icr10.c icr20.c icr71.c icr72.c icr75.c icrx7.c \
id1.c id5100.c perseus.c ic2730.c \
ic707.c ic728.c ic751.c ic761.c \
ic78.c ic7800.c ic7850.c ic7851.c \
ic78.c ic7800.c ic785x.c \
ic7000.c ic7100.c ic7200.c ic7300.c ic7600.c ic7700.c \
icom.c icom.h icom_defs.h frame.c frame.h optoscan.c optoscan.h

Wyświetl plik

@ -1,236 +0,0 @@
/*
* Hamlib CI-V backend - description of IC-7851 and variations
* Derived from ic7800.c by W9MDB -- needs testing
* Copyright (c) 2009-2010 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 <stdlib.h>
#include <string.h> /* String function definitions */
#include <hamlib/rig.h>
#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 IC7851_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 IC7851_1HZ_TS_MODES IC7851_ALL_RX_MODES
#define IC7851_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 IC7851_AM_TX_MODES (RIG_MODE_AM)
#define IC7851_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 IC7851_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_APF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC)
#define IC7851_VFOS (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
#define IC7851_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT)
#define IC7851_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE)
#define IC7851_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO)
#define IC7851_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3|RIG_ANT_4)
/*
* FIXME: real measures!
*/
#define IC7851_STR_CAL { 3, \
{ \
{ 0, -54 }, /* S0 */ \
{ 120, 0 }, /* S9 */ \
{ 241, 60 } /* S9+60 */ \
} }
extern int ic7800_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
extern int ic7800_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
/*
* IC-7851 rig capabilities.
*
* TODO: complete command set (esp. the $1A bunch!) and testing..
*/
static const struct icom_priv_caps ic7851_priv_caps = {
0x8e, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list
};
const struct rig_caps ic7851_caps = {
.rig_model = RIG_MODEL_IC7851,
.model_name = "IC-7851",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.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 = 1000,
.retry = 3,
.has_get_func = IC7851_FUNCS,
.has_set_func = IC7851_FUNCS,
.has_get_level = IC7851_LEVELS,
.has_set_level = RIG_LEVEL_SET(IC7851_LEVELS),
.has_get_parm = IC7851_PARMS,
.has_set_parm = RIG_PARM_SET(IC7851_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 = { 3, 6, 9, 12, 15, 18, 21, RIG_DBLST_END, },
.max_rit = Hz(9999),
.max_xit = Hz(9999),
.max_ifshift = Hz(0),
.targetable_vfo = 0,
.vfo_ops = IC7851_VFO_OPS,
.scan_ops = IC7851_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),IC7851_ALL_RX_MODES,-1,-1,IC7851_VFOS,IC7851_ANTS},
RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC7851_OTHER_TX_MODES, W(5),W(200),IC7851_VFOS,IC7851_ANTS),
FRQ_RNG_6m(1,IC7851_OTHER_TX_MODES, W(5),W(200),IC7851_VFOS,IC7851_ANTS),
FRQ_RNG_HF(1,IC7851_AM_TX_MODES, W(5),W(50),IC7851_VFOS,IC7851_ANTS), /* AM class */
FRQ_RNG_6m(1,IC7851_AM_TX_MODES, W(5),W(50),IC7851_VFOS,IC7851_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(60),IC7851_ALL_RX_MODES,-1,-1,IC7851_VFOS,IC7851_ANTS},
RIG_FRNG_END, },
.tx_range_list2 = {
FRQ_RNG_HF(2,IC7851_OTHER_TX_MODES, W(5),W(200),IC7851_VFOS,IC7851_ANTS),
FRQ_RNG_6m(2,IC7851_OTHER_TX_MODES, W(5),W(200),IC7851_VFOS,IC7851_ANTS),
FRQ_RNG_HF(2,IC7851_AM_TX_MODES, W(5),W(50),IC7851_VFOS,IC7851_ANTS), /* AM class */
FRQ_RNG_6m(2,IC7851_AM_TX_MODES, W(5),W(50),IC7851_VFOS,IC7851_ANTS), /* AM class */
/* USA only, TBC: end of range and modes */
{MHz(5.33050),MHz(5.33350),IC7851_OTHER_TX_MODES,W(2),W(100),IC7851_VFOS,IC7851_ANTS}, /* USA only */
{MHz(5.34650),MHz(5.34950),IC7851_OTHER_TX_MODES,W(2),W(100),IC7851_VFOS,IC7851_ANTS}, /* USA only */
{MHz(5.36650),MHz(5.36950),IC7851_OTHER_TX_MODES,W(2),W(100),IC7851_VFOS,IC7851_ANTS}, /* USA only */
{MHz(5.37150),MHz(5.37450),IC7851_OTHER_TX_MODES,W(2),W(100),IC7851_VFOS,IC7851_ANTS}, /* USA only */
{MHz(5.40350),MHz(5.40650),IC7851_OTHER_TX_MODES,W(2),W(100),IC7851_VFOS,IC7851_ANTS}, /* USA only */
RIG_FRNG_END, },
.tuning_steps = {
{IC7851_1HZ_TS_MODES,1},
{IC7851_ALL_RX_MODES,Hz(100)},
{IC7851_ALL_RX_MODES,kHz(1)},
{IC7851_ALL_RX_MODES,kHz(5)},
{IC7851_ALL_RX_MODES,kHz(9)},
{IC7851_ALL_RX_MODES,kHz(10)},
{IC7851_ALL_RX_MODES,kHz(12.5)},
{IC7851_ALL_RX_MODES,kHz(20)},
{IC7851_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_AM, kHz(6)},
{RIG_MODE_AM, kHz(2.4)},
{RIG_MODE_FM, kHz(15)},
{RIG_MODE_FM, kHz(8)},
RIG_FLT_END,
},
.str_cal = IC7851_STR_CAL,
.cfgparams = icom_cfg_params,
.set_conf = icom_set_conf,
.get_conf = icom_get_conf,
.priv = (void*)&ic7851_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_with_data,
.get_mode = icom_get_mode_with_data,
.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 = ic7800_set_level,
.get_level = ic7800_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,
};

Wyświetl plik

@ -1,5 +1,5 @@
/*
* Hamlib CI-V backend - description of IC-7850 and variations
* Hamlib CI-V backend - description of IC-785x and variations
* Derived from ic7800.c by W9MDB -- needs testing
* Copyright (c) 2009-2010 by Stephane Fillod
*
@ -40,27 +40,27 @@
/*
* TODO: PSK and PSKR
*/
#define IC7850_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 IC7850_1HZ_TS_MODES IC7850_ALL_RX_MODES
#define IC7850_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 IC7850_AM_TX_MODES (RIG_MODE_AM)
#define IC785x_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 IC785x_1HZ_TS_MODES IC785x_ALL_RX_MODES
#define IC785x_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 IC785x_AM_TX_MODES (RIG_MODE_AM)
#define IC7850_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 IC785x_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 IC7850_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_APF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC)
#define IC785x_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_APF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC)
#define IC7850_VFOS (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
#define IC7850_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT)
#define IC785x_VFOS (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
#define IC785x_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT)
#define IC7850_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE)
#define IC7850_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO)
#define IC785x_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE)
#define IC785x_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO)
#define IC7850_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3|RIG_ANT_4)
#define IC785x_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3|RIG_ANT_4)
/*
* FIXME: real measures!
*/
#define IC7850_STR_CAL { 3, \
#define IC785x_STR_CAL { 3, \
{ \
{ 0, -54 }, /* S0 */ \
{ 120, 0 }, /* S9 */ \
@ -72,11 +72,11 @@ extern int ic7800_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
extern int ic7800_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
/*
* IC-7850 rig capabilities.
* IC-785x rig capabilities.
*
* TODO: complete command set (esp. the $1A bunch!) and testing..
*/
static const struct icom_priv_caps ic7850_priv_caps = {
static const struct icom_priv_caps ic785x_priv_caps = {
0x6a, /* default address */
0, /* 731 mode */
0, /* no XCHG */
@ -84,9 +84,9 @@ static const struct icom_priv_caps ic7850_priv_caps = {
};
const struct rig_caps ic7850_caps = {
.rig_model = RIG_MODEL_IC7850,
.model_name = "IC-7850",
const struct rig_caps ic785x_caps = {
.rig_model = RIG_MODEL_IC785x,
.model_name = "IC-785x",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
@ -105,12 +105,12 @@ const struct rig_caps ic7850_caps = {
.post_write_delay = 0,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7850_FUNCS,
.has_set_func = IC7850_FUNCS,
.has_get_level = IC7850_LEVELS,
.has_set_level = RIG_LEVEL_SET(IC7850_LEVELS),
.has_get_parm = IC7850_PARMS,
.has_set_parm = RIG_PARM_SET(IC7850_PARMS), /* FIXME: parms */
.has_get_func = IC785x_FUNCS,
.has_set_func = IC785x_FUNCS,
.has_get_level = IC785x_LEVELS,
.has_set_level = RIG_LEVEL_SET(IC785x_LEVELS),
.has_get_parm = IC785x_PARMS,
.has_set_parm = RIG_PARM_SET(IC785x_PARMS), /* FIXME: parms */
.level_gran = {
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
},
@ -123,8 +123,8 @@ const struct rig_caps ic7850_caps = {
.max_xit = Hz(9999),
.max_ifshift = Hz(0),
.targetable_vfo = 0,
.vfo_ops = IC7850_VFO_OPS,
.scan_ops = IC7850_SCAN_OPS,
.vfo_ops = IC785x_VFO_OPS,
.scan_ops = IC785x_SCAN_OPS,
.transceive = RIG_TRN_RIG,
.bank_qty = 0,
.chan_desc_sz = 0,
@ -135,40 +135,40 @@ const struct rig_caps ic7850_caps = {
RIG_CHAN_END,
},
.rx_range_list1 = { {kHz(30),MHz(60),IC7850_ALL_RX_MODES,-1,-1,IC7850_VFOS,IC7850_ANTS},
.rx_range_list1 = { {kHz(30),MHz(60),IC785x_ALL_RX_MODES,-1,-1,IC785x_VFOS,IC785x_ANTS},
RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC7850_OTHER_TX_MODES, W(5),W(200),IC7850_VFOS,IC7850_ANTS),
FRQ_RNG_6m(1,IC7850_OTHER_TX_MODES, W(5),W(200),IC7850_VFOS,IC7850_ANTS),
FRQ_RNG_HF(1,IC7850_AM_TX_MODES, W(5),W(50),IC7850_VFOS,IC7850_ANTS), /* AM class */
FRQ_RNG_6m(1,IC7850_AM_TX_MODES, W(5),W(50),IC7850_VFOS,IC7850_ANTS), /* AM class */
FRQ_RNG_HF(1,IC785x_OTHER_TX_MODES, W(5),W(200),IC785x_VFOS,IC785x_ANTS),
FRQ_RNG_6m(1,IC785x_OTHER_TX_MODES, W(5),W(200),IC785x_VFOS,IC785x_ANTS),
FRQ_RNG_HF(1,IC785x_AM_TX_MODES, W(5),W(50),IC785x_VFOS,IC785x_ANTS), /* AM class */
FRQ_RNG_6m(1,IC785x_AM_TX_MODES, W(5),W(50),IC785x_VFOS,IC785x_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(60),IC7850_ALL_RX_MODES,-1,-1,IC7850_VFOS,IC7850_ANTS},
.rx_range_list2 = { {kHz(30),MHz(60),IC785x_ALL_RX_MODES,-1,-1,IC785x_VFOS,IC785x_ANTS},
RIG_FRNG_END, },
.tx_range_list2 = {
FRQ_RNG_HF(2,IC7850_OTHER_TX_MODES, W(5),W(200),IC7850_VFOS,IC7850_ANTS),
FRQ_RNG_6m(2,IC7850_OTHER_TX_MODES, W(5),W(200),IC7850_VFOS,IC7850_ANTS),
FRQ_RNG_HF(2,IC7850_AM_TX_MODES, W(5),W(50),IC7850_VFOS,IC7850_ANTS), /* AM class */
FRQ_RNG_6m(2,IC7850_AM_TX_MODES, W(5),W(50),IC7850_VFOS,IC7850_ANTS), /* AM class */
FRQ_RNG_HF(2,IC785x_OTHER_TX_MODES, W(5),W(200),IC785x_VFOS,IC785x_ANTS),
FRQ_RNG_6m(2,IC785x_OTHER_TX_MODES, W(5),W(200),IC785x_VFOS,IC785x_ANTS),
FRQ_RNG_HF(2,IC785x_AM_TX_MODES, W(5),W(50),IC785x_VFOS,IC785x_ANTS), /* AM class */
FRQ_RNG_6m(2,IC785x_AM_TX_MODES, W(5),W(50),IC785x_VFOS,IC785x_ANTS), /* AM class */
/* USA only, TBC: end of range and modes */
{MHz(5.33050),MHz(5.33350),IC7850_OTHER_TX_MODES,W(2),W(100),IC7850_VFOS,IC7850_ANTS}, /* USA only */
{MHz(5.34650),MHz(5.34950),IC7850_OTHER_TX_MODES,W(2),W(100),IC7850_VFOS,IC7850_ANTS}, /* USA only */
{MHz(5.36650),MHz(5.36950),IC7850_OTHER_TX_MODES,W(2),W(100),IC7850_VFOS,IC7850_ANTS}, /* USA only */
{MHz(5.37150),MHz(5.37450),IC7850_OTHER_TX_MODES,W(2),W(100),IC7850_VFOS,IC7850_ANTS}, /* USA only */
{MHz(5.40350),MHz(5.40650),IC7850_OTHER_TX_MODES,W(2),W(100),IC7850_VFOS,IC7850_ANTS}, /* USA only */
{MHz(5.33050),MHz(5.33350),IC785x_OTHER_TX_MODES,W(2),W(100),IC785x_VFOS,IC785x_ANTS}, /* USA only */
{MHz(5.34650),MHz(5.34950),IC785x_OTHER_TX_MODES,W(2),W(100),IC785x_VFOS,IC785x_ANTS}, /* USA only */
{MHz(5.36650),MHz(5.36950),IC785x_OTHER_TX_MODES,W(2),W(100),IC785x_VFOS,IC785x_ANTS}, /* USA only */
{MHz(5.37150),MHz(5.37450),IC785x_OTHER_TX_MODES,W(2),W(100),IC785x_VFOS,IC785x_ANTS}, /* USA only */
{MHz(5.40350),MHz(5.40650),IC785x_OTHER_TX_MODES,W(2),W(100),IC785x_VFOS,IC785x_ANTS}, /* USA only */
RIG_FRNG_END, },
.tuning_steps = {
{IC7850_1HZ_TS_MODES,1},
{IC7850_ALL_RX_MODES,Hz(100)},
{IC7850_ALL_RX_MODES,kHz(1)},
{IC7850_ALL_RX_MODES,kHz(5)},
{IC7850_ALL_RX_MODES,kHz(9)},
{IC7850_ALL_RX_MODES,kHz(10)},
{IC7850_ALL_RX_MODES,kHz(12.5)},
{IC7850_ALL_RX_MODES,kHz(20)},
{IC7850_ALL_RX_MODES,kHz(25)},
{IC785x_1HZ_TS_MODES,1},
{IC785x_ALL_RX_MODES,Hz(100)},
{IC785x_ALL_RX_MODES,kHz(1)},
{IC785x_ALL_RX_MODES,kHz(5)},
{IC785x_ALL_RX_MODES,kHz(9)},
{IC785x_ALL_RX_MODES,kHz(10)},
{IC785x_ALL_RX_MODES,kHz(12.5)},
{IC785x_ALL_RX_MODES,kHz(20)},
{IC785x_ALL_RX_MODES,kHz(25)},
RIG_TS_END,
},
/* mode/filter list, remember: order matters! */
@ -181,13 +181,13 @@ const struct rig_caps ic7850_caps = {
{RIG_MODE_FM, kHz(8)},
RIG_FLT_END,
},
.str_cal = IC7850_STR_CAL,
.str_cal = IC785x_STR_CAL,
.cfgparams = icom_cfg_params,
.set_conf = icom_set_conf,
.get_conf = icom_get_conf,
.priv = (void*)&ic7850_priv_caps,
.priv = (void*)&ic785x_priv_caps,
.rig_init = icom_init,
.rig_cleanup = icom_cleanup,
.rig_open = NULL,

Wyświetl plik

@ -323,8 +323,7 @@ static const struct icom_addr icom_addr_list[] = {
{ RIG_MODEL_IC765, 0x2c },
{ RIG_MODEL_IC775, 0x46 },
{ RIG_MODEL_IC7800, 0x6a },
{ RIG_MODEL_IC7850, 0x8e },
{ RIG_MODEL_IC7851, 0x8e },
{ RIG_MODEL_IC785x, 0x8e },
{ RIG_MODEL_IC781, 0x26 },
{ RIG_MODEL_IC820, 0x42 },
{ RIG_MODEL_IC821, 0x4c },
@ -3744,8 +3743,7 @@ DECLARE_INITRIG_BACKEND(icom)
rig_register(&ic7700_caps);
rig_register(&ic78_caps);
rig_register(&ic7800_caps);
rig_register(&ic7850_caps);
rig_register(&ic7851_caps);
rig_register(&ic785x_caps);
rig_register(&ic7000_caps);
rig_register(&ic7100_caps);
rig_register(&ic7200_caps);

Wyświetl plik

@ -232,8 +232,7 @@ extern const struct rig_caps ic7700_caps;
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 ic7850_caps;
extern const struct rig_caps ic7851_caps;
extern const struct rig_caps ic785x_caps;
extern const struct rig_caps ic7000_caps;
extern const struct rig_caps ic7100_caps;
extern const struct rig_caps ic7200_caps;

Wyświetl plik

@ -214,8 +214,7 @@
#define RIG_MODEL_IC2730 RIG_MAKE_MODEL(RIG_ICOM, 72)
#define RIG_MODEL_IC7300 RIG_MAKE_MODEL(RIG_ICOM, 73)
#define RIG_MODEL_PERSEUS RIG_MAKE_MODEL(RIG_ICOM, 74)
#define RIG_MODEL_IC7850 RIG_MAKE_MODEL(RIG_ICOM, 75)
#define RIG_MODEL_IC7851 RIG_MAKE_MODEL(RIG_ICOM, 76)
#define RIG_MODEL_IC785x RIG_MAKE_MODEL(RIG_ICOM, 75)
/* next one is 77 */
/*