mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

* converted RIG_LEVEL_STRENGTH to RIG_LEVEL_RAWSTR. RIG_LEVEL_STRENGTH is 

then derived from calibration table
* added support for get_ant/set_ant


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1587 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.0
Stéphane Fillod, F8CFE 2003-11-16 17:24:34 +00:00
rodzic d32781a806
commit 78f4963b3a
3 zmienionych plików z 101 dodań i 107 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
icom/ic737.c
Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-737 and variations * Hamlib CI-V backend - description of IC-737
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2003 by Stephane Fillod
* *
* $Id: ic737.c,v 1.3 2003-10-01 19:31:56 fillods Exp $ * $Id: ic737.c,v 1.4 2003-11-16 17:24:34 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -33,7 +33,6 @@
/* /*
* IC-737 * IC-737
* TODO: add antenna caps and ic737_set_ant support: Cn 0x12, Sc 0x00/0x01
*/ */
@ -50,24 +49,19 @@
#define IC737_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) #define IC737_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY)
#define IC737_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_VFO) #define IC737_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_VFO)
#define IC737_ANTS 0 /* FIXME: declare both antenna connectors */ #define IC737_ANTS (RIG_ANT_1|RIG_ANT_2)
#define IC737_STR_CAL { 0, { } }
/*
*/
static const struct icom_priv_caps ic737_priv_caps = { static const struct icom_priv_caps ic737_priv_caps = {
0x3c, /* default address */ 0x3c, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic737_ts_sc_list, ic737_ts_sc_list
IC737_STR_CAL
}; };
const struct rig_caps ic737_caps = { const struct rig_caps ic737_caps = {
.rig_model = RIG_MODEL_IC737, .rig_model = RIG_MODEL_IC737,
.model_name = "IC-737", .model_name = "IC-737",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = "0.2", .version = "0.2.1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_NEW, .status = RIG_STATUS_NEW,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -168,6 +162,8 @@ const struct rig_caps ic737_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_mem = icom_set_mem, .set_mem = icom_set_mem,

41
icom/ic746.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-746 and variations * Hamlib CI-V backend - description of IC-746 and variations
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2003 by Stephane Fillod
* *
* $Id: ic746.c,v 1.1 2003-10-24 22:59:18 fillods Exp $ * $Id: ic746.c,v 1.2 2003-11-16 17:24:34 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -29,6 +29,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "token.h" #include "token.h"
#include "idx_builtin.h"
#include "icom.h" #include "icom.h"
#include "icom_defs.h" #include "icom_defs.h"
@ -42,7 +43,7 @@
* *
* TODO: * TODO:
* - advanced scanning functions * - advanced scanning functions
* - set_ant 0x12,[1|2] * - fix: set_ant 0x12,[1|2]
* - set_channel * - set_channel
* - set_ctcss_tone/ctcss_sql * - set_ctcss_tone/ctcss_sql
* - set keyer? * - set keyer?
@ -62,13 +63,13 @@
#define IC746_FUNC_ALL (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_RNF|RIG_FUNC_ANF|RIG_FUNC_APF) #define IC746_FUNC_ALL (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_RNF|RIG_FUNC_ANF|RIG_FUNC_APF)
#define IC746_LEVEL_ALL (RIG_LEVEL_AF|RIG_LEVEL_RF|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_APF|RIG_LEVEL_SQL|RIG_LEVEL_STRENGTH) #define IC746_LEVEL_ALL (RIG_LEVEL_AF|RIG_LEVEL_RF|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_APF|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR)
#define IC746_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define IC746_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
#define IC746_ANTS (RIG_ANT_1|RIG_ANT_2) #define IC746_ANTS (RIG_ANT_1|RIG_ANT_2)
#define IC746_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define IC746_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL)
#define IC746_SCAN_OPS (RIG_SCAN_MEM) #define IC746_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM)
#define IC746_STR_CAL { 16, \ #define IC746_STR_CAL { 16, \
{ \ { \
@ -96,8 +97,7 @@
static const struct icom_priv_caps ic746_priv_caps = { static const struct icom_priv_caps ic746_priv_caps = {
0x56, /* default address */ 0x56, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic756pro_ts_sc_list, ic756pro_ts_sc_list
IC746_STR_CAL /* FIXME */
}; };
const struct rig_caps ic746_caps = { const struct rig_caps ic746_caps = {
@ -127,7 +127,9 @@ const struct rig_caps ic746_caps = {
.has_set_level = RIG_LEVEL_SET(IC746_LEVEL_ALL), .has_set_level = RIG_LEVEL_SET(IC746_LEVEL_ALL),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */ .level_gran = {
[LVL_RAWSTR].min.i = 0, [LVL_RAWSTR].max.i = 255,
},
.parm_gran = {}, .parm_gran = {},
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
.dcs_list = NULL, .dcs_list = NULL,
@ -198,6 +200,7 @@ const struct rig_caps ic746_caps = {
{RIG_MODE_FM|RIG_MODE_AM, kHz(9)}, {RIG_MODE_FM|RIG_MODE_AM, kHz(9)},
RIG_FLT_END, RIG_FLT_END,
}, },
.str_cal = IC746_STR_CAL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
@ -214,6 +217,8 @@ const struct rig_caps ic746_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_level = icom_set_level, .set_level = icom_set_level,
@ -246,8 +251,7 @@ const struct rig_caps ic746_caps = {
static const struct icom_priv_caps ic746pro_priv_caps = { static const struct icom_priv_caps ic746pro_priv_caps = {
0x66, /* default address */ 0x66, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic756pro_ts_sc_list, ic756pro_ts_sc_list
IC746_STR_CAL /* FIXME */
}; };
const struct rig_caps ic746pro_caps = { const struct rig_caps ic746pro_caps = {
@ -277,10 +281,12 @@ const struct rig_caps ic746pro_caps = {
.has_set_level = RIG_LEVEL_SET(IC746_LEVEL_ALL), .has_set_level = RIG_LEVEL_SET(IC746_LEVEL_ALL),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */ .level_gran = {
[LVL_RAWSTR].min.i = 0, [LVL_RAWSTR].max.i = 255,
},
.parm_gran = {}, .parm_gran = {},
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
.dcs_list = NULL, .dcs_list = full_dcs_list,
.preamp = { 10, 20, RIG_DBLST_END, }, /* FIXME: TBC */ .preamp = { 10, 20, RIG_DBLST_END, }, /* FIXME: TBC */
.attenuator = { 20, RIG_DBLST_END, }, .attenuator = { 20, RIG_DBLST_END, },
.max_rit = Hz(9999), .max_rit = Hz(9999),
@ -296,6 +302,7 @@ const struct rig_caps ic746pro_caps = {
.chan_list = { .chan_list = {
{ 1, 99, RIG_MTYPE_MEM }, { 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */ { 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 102, 102, RIG_MTYPE_CALL },
RIG_CHAN_END, RIG_CHAN_END,
}, },
@ -343,12 +350,14 @@ const struct rig_caps ic746pro_caps = {
/* mode/filter list, remember: order matters! */ /* mode/filter list, remember: order matters! */
.filters = { .filters = {
{RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_CW, kHz(2.1)}, {RIG_MODE_SSB|RIG_MODE_RTTYR|RIG_MODE_CWR|RIG_MODE_RTTY|RIG_MODE_CW, kHz(2.4)},
{RIG_MODE_CW, Hz(500)}, {RIG_MODE_RTTY|RIG_MODE_RTTYR, Hz(350)},
{RIG_MODE_FM, kHz(12)}, {RIG_MODE_CW|RIG_MODE_CWR, Hz(500)},
{RIG_MODE_FM|RIG_MODE_AM, kHz(9)}, {RIG_MODE_FM, kHz(15)},
{RIG_MODE_FM|RIG_MODE_AM, kHz(6)},
RIG_FLT_END, RIG_FLT_END,
}, },
.str_cal = IC746_STR_CAL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
@ -365,6 +374,8 @@ const struct rig_caps ic746pro_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_level = icom_set_level, .set_level = icom_set_level,

149
icom/ic756.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-756 and variations * Hamlib CI-V backend - description of IC-756 and variations
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2003 by Stephane Fillod
* *
* $Id: ic756.c,v 1.7 2003-04-06 18:40:35 fillods Exp $ * $Id: ic756.c,v 1.8 2003-11-16 17:24:34 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -29,11 +29,13 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "token.h" #include "token.h"
#include "idx_builtin.h"
#include "icom.h" #include "icom.h"
#include "icom_defs.h" #include "icom_defs.h"
#include "frame.h" #include "frame.h"
#include "misc.h" #include "misc.h"
#include "bandplan.h"
#define IC756_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) #define IC756_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM)
@ -47,12 +49,14 @@
#define IC756PRO_FUNC_ALL (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_RNF) #define IC756PRO_FUNC_ALL (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_RNF)
#define IC756PRO_LEVEL_ALL (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_SQLSTAT|RIG_LEVEL_STRENGTH) #define IC756PRO_LEVEL_ALL (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_SQLSTAT|RIG_LEVEL_RAWSTR)
#define IC756_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define IC756_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
#define IC756_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define IC756_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL)
#define IC756_SCAN_OPS (RIG_SCAN_MEM) #define IC756_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO)
#define IC756_ANTS (RIG_ANT_1|RIG_ANT_2)
#define IC756PRO_STR_CAL { 16, \ #define IC756PRO_STR_CAL { 16, \
{ \ { \
@ -80,8 +84,7 @@
static const struct icom_priv_caps ic756_priv_caps = { static const struct icom_priv_caps ic756_priv_caps = {
0x50, /* default address */ 0x50, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic756pro_ts_sc_list, ic756pro_ts_sc_list
IC756PRO_STR_CAL /* FIXME */
}; };
const struct rig_caps ic756_caps = { const struct rig_caps ic756_caps = {
@ -111,7 +114,9 @@ const struct rig_caps ic756_caps = {
.has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL), .has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */ .level_gran = {
[LVL_RAWSTR].min.i = 0, [LVL_RAWSTR].max.i = 255,
},
.parm_gran = {}, .parm_gran = {},
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
.dcs_list = NULL, .dcs_list = NULL,
@ -133,31 +138,22 @@ const struct rig_caps ic756_caps = {
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
.tx_range_list1 = { RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_6m(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_HF(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
FRQ_RNG_6m(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL}, .rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list2 = { {kHz(1800),MHz(2)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, /* 100W class */ .tx_range_list2 = {
{kHz(1800),MHz(2)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, /* 40W class */ FRQ_RNG_HF(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, FRQ_RNG_HF(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(10100),kHz(10150),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(10100),kHz(10150),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tuning_steps = { .tuning_steps = {
@ -178,6 +174,7 @@ const struct rig_caps ic756_caps = {
{RIG_MODE_FM, kHz(8)}, {RIG_MODE_FM, kHz(8)},
RIG_FLT_END, RIG_FLT_END,
}, },
.str_cal = IC756PRO_STR_CAL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
@ -194,6 +191,8 @@ const struct rig_caps ic756_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_level = icom_set_level, .set_level = icom_set_level,
@ -228,8 +227,7 @@ const struct rig_caps ic756_caps = {
static const struct icom_priv_caps ic756pro_priv_caps = { static const struct icom_priv_caps ic756pro_priv_caps = {
0x5c, /* default address */ 0x5c, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic756_ts_sc_list, ic756_ts_sc_list
IC756PRO_STR_CAL
}; };
const struct rig_caps ic756pro_caps = { const struct rig_caps ic756pro_caps = {
@ -259,7 +257,9 @@ const struct rig_caps ic756pro_caps = {
.has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL), .has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */ .level_gran = {
[LVL_RAWSTR].min.i = 0, [LVL_RAWSTR].max.i = 255,
},
.parm_gran = {}, .parm_gran = {},
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
.dcs_list = NULL, .dcs_list = NULL,
@ -281,31 +281,22 @@ const struct rig_caps ic756pro_caps = {
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
.tx_range_list1 = { RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_6m(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_HF(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
FRQ_RNG_6m(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL}, .rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list2 = { {kHz(1800),MHz(2)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, /* 100W class */ .tx_range_list2 = {
{kHz(1800),MHz(2)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, /* 40W class */ FRQ_RNG_HF(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, FRQ_RNG_HF(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(10100),kHz(10150),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(10100),kHz(10150),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tuning_steps = { .tuning_steps = {
@ -326,6 +317,7 @@ const struct rig_caps ic756pro_caps = {
{RIG_MODE_FM, kHz(8)}, {RIG_MODE_FM, kHz(8)},
RIG_FLT_END, RIG_FLT_END,
}, },
.str_cal = IC756PRO_STR_CAL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
@ -342,6 +334,8 @@ const struct rig_caps ic756pro_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_level = icom_set_level, .set_level = icom_set_level,
@ -381,8 +375,7 @@ const struct rig_caps ic756pro_caps = {
static const struct icom_priv_caps ic756pro2_priv_caps = { static const struct icom_priv_caps ic756pro2_priv_caps = {
0x64, /* default address */ 0x64, /* default address */
0, /* 731 mode */ 0, /* 731 mode */
ic756_ts_sc_list, ic756_ts_sc_list
IC756PRO_STR_CAL
}; };
/* /*
@ -447,7 +440,9 @@ const struct rig_caps ic756pro2_caps = {
.has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL), .has_set_level = RIG_LEVEL_SET(IC756PRO_LEVEL_ALL),
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
.level_gran = {}, /* granularity */ .level_gran = {
[LVL_RAWSTR].min.i = 0, [LVL_RAWSTR].max.i = 255,
},
.parm_gran = {}, .parm_gran = {},
.extparms = ic756pro2_ext_parms, .extparms = ic756pro2_ext_parms,
.ctcss_list = common_ctcss_list, .ctcss_list = common_ctcss_list,
@ -470,32 +465,23 @@ const struct rig_caps ic756pro2_caps = {
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
.tx_range_list1 = { RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_6m(1,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
FRQ_RNG_HF(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
FRQ_RNG_6m(1,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL}, .rx_range_list2 = { {kHz(30),MHz(60),IC756_ALL_RX_MODES,-1,-1,IC756_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list2 = { {kHz(1800),MHz(2)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, /* 100W class */ .tx_range_list2 = {
{kHz(1800),MHz(2)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, /* 40W class */ FRQ_RNG_HF(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_OTHER_TX_MODES, W(5),W(100),IC756_VFO_ALL,IC756_ANTS),
{kHz(3500),MHz(4)-1,IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, FRQ_RNG_HF(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL}, FRQ_RNG_6m(2,IC756_AM_TX_MODES, W(2),W(40),IC756_VFO_ALL,IC756_ANTS), /* AM class */
{MHz(7),kHz(7300),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL}, RIG_FRNG_END, },
{kHz(10100),kHz(10150),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(10100),kHz(10150),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(14),kHz(14350),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(18068),kHz(18168),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(21),kHz(21450),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{kHz(24890),kHz(24990),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(28),kHz(29700),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_OTHER_TX_MODES,5000,100000,IC756_VFO_ALL},
{MHz(50),MHz(54),IC756_AM_TX_MODES,5000,40000,IC756_VFO_ALL},
RIG_FRNG_END, },
.tuning_steps = { .tuning_steps = {
{IC756_1HZ_TS_MODES,1}, {IC756_1HZ_TS_MODES,1},
@ -515,6 +501,7 @@ const struct rig_caps ic756pro2_caps = {
{RIG_MODE_FM, kHz(8)}, {RIG_MODE_FM, kHz(8)},
RIG_FLT_END, RIG_FLT_END,
}, },
.str_cal = IC756PRO_STR_CAL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
@ -531,6 +518,8 @@ const struct rig_caps ic756pro2_caps = {
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.set_ant = icom_set_ant,
.get_ant = icom_get_ant,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_level = icom_set_level, .set_level = icom_set_level,
@ -647,5 +636,3 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val)
return RIG_OK; return RIG_OK;
} }