kopia lustrzana https://github.com/Hamlib/Hamlib
Add TS-890S as derivative of TS-480 plus new modes
Michael Black
rodzic
2b5f01fb75
commit
005fb29cf7
|
|
@ -909,8 +909,8 @@ typedef unsigned long long rmode_t;
|
|||
#define RIG_MODE_NXDN_N (1ULL << 27) /*!< \c NXDN-N -- VHF,UHF digital mode IC-R8600 */
|
||||
#define RIG_MODE_DCR (1ULL << 28) /*!< \c DCR -- VHF,UHF digital mode IC-R8600 */
|
||||
#define RIG_MODE_AMN (1ULL << 29) /*!< \c AM-N -- Narrow band AM mode IC-R30 */
|
||||
#define RIG_MODE_BIT30 (1ULL << 30) /* reserved for future expansion */
|
||||
#define RIG_MODE_BIT31 (1ULL << 31) /* reserved for future expansion */
|
||||
#define RIG_MODE_PSK (1ULL << 30) /* PSK - Kenwood PSK and others */
|
||||
#define RIG_MODE_PSKR (1ULL << 31) /* PSKR - Kenwood PSKR and others */
|
||||
#define RIG_MODE_BIT32 (1ULL << 32) /* reserved for future expansion */
|
||||
#define RIG_MODE_BIT33 (1ULL << 33) /* reserved for future expansion */
|
||||
#define RIG_MODE_BIT34 (1ULL << 34) /* reserved for future expansion */
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@
|
|||
#define RIG_MODEL_XG3 RIG_MAKE_MODEL(RIG_KENWOOD, 38) /* Elecraft XG-3 signal generator */
|
||||
#define RIG_MODEL_TS990S RIG_MAKE_MODEL(RIG_KENWOOD, 39)
|
||||
#define RIG_MODEL_HPSDR RIG_MAKE_MODEL(RIG_KENWOOD, 40) /* OpenHPSDR, PiHPSDR */
|
||||
#define RIG_MODEL_TS890S RIG_MAKE_MODEL(RIG_KENWOOD, 41)
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ static const struct kenwood_id kenwood_id_list[] = {
|
|||
{ RIG_MODEL_TS590S, 21 },
|
||||
{ RIG_MODEL_TS990S, 22 },
|
||||
{ RIG_MODEL_TS590SG, 23 },
|
||||
{ RIG_MODEL_TS890S, 24 },
|
||||
{ RIG_MODEL_NONE, UNKNOWN_ID }, /* end marker */
|
||||
};
|
||||
|
||||
|
|
@ -132,7 +133,13 @@ rmode_t kenwood_mode_table[KENWOOD_MODE_TABLE_MAX] = {
|
|||
[6] = RIG_MODE_RTTY,
|
||||
[7] = RIG_MODE_CWR,
|
||||
[8] = RIG_MODE_NONE, /* TUNE mode */
|
||||
[9] = RIG_MODE_RTTYR
|
||||
[9] = RIG_MODE_RTTYR,
|
||||
[10] = RIG_MODE_PSK,
|
||||
[11] = RIG_MODE_PSKR,
|
||||
[12] = RIG_MODE_PKTLSB,
|
||||
[13] = RIG_MODE_PKTUSB,
|
||||
[14] = RIG_MODE_PKTFM,
|
||||
[15] = RIG_MODE_PKTAM
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -3437,6 +3444,7 @@ DECLARE_INITRIG_BACKEND(kenwood)
|
|||
|
||||
rig_register(&f6k_caps);
|
||||
rig_register(&pihpsdr_caps);
|
||||
rig_register(&ts890s_caps);
|
||||
|
||||
return RIG_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ extern const struct rig_caps transfox_caps;
|
|||
|
||||
extern const struct rig_caps f6k_caps;
|
||||
extern const struct rig_caps pihpsdr_caps;
|
||||
extern const struct rig_caps ts890s_caps;
|
||||
|
||||
/* use when not interested in the answer, but want to check its len */
|
||||
static int inline kenwood_simple_transaction(RIG *rig, const char *cmd, size_t expected)
|
||||
|
|
|
|||
161
kenwood/ts480.c
161
kenwood/ts480.c
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Hamlib Kenwood backend - TS480 description
|
||||
* Hamlib Kenwood backend - TS890s description
|
||||
* Copyright (c) 2000-2004 by Stephane Fillod and Juergen Rinas
|
||||
*
|
||||
*
|
||||
|
|
@ -31,6 +32,8 @@
|
|||
#include "kenwood.h"
|
||||
|
||||
#define TS480_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR)
|
||||
#define TS890_ALL_MODES (RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_CW|RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_RTTY|RIG_MODE_CWR|RIG_MODE_RTTYR|RIG_MODE_PSK|RIG_MODE_PSKR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM)
|
||||
|
||||
#define TS480_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY)
|
||||
#define TS480_AM_TX_MODES RIG_MODE_AM
|
||||
#define TS480_VFO (RIG_VFO_A|RIG_VFO_B)
|
||||
|
|
@ -252,6 +255,10 @@ static struct kenwood_priv_caps ts480_priv_caps = {
|
|||
.cmdtrm = EOM_KEN,
|
||||
};
|
||||
|
||||
static struct kenwood_priv_caps ts890s_priv_caps = {
|
||||
.cmdtrm = EOM_KEN,
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* ts480 rig capabilities.
|
||||
|
|
@ -405,6 +412,160 @@ const struct rig_caps ts480_caps = {
|
|||
.get_func = kenwood_get_func,
|
||||
};
|
||||
|
||||
/*
|
||||
* ts890s rig capabilities.
|
||||
* Copied from ts480_caps
|
||||
* Where you see TS480 in this the values have not been verified
|
||||
* Notice that some rigs share the same functions.
|
||||
* Also this struct is READONLY!
|
||||
*/
|
||||
const struct rig_caps ts890s_caps = {
|
||||
.rig_model = RIG_MODEL_TS890S,
|
||||
.model_name = "TS-890S",
|
||||
.mfg_name = "Kenwood",
|
||||
.version = BACKEND_VER ".1",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_ALPHA,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
.ptt_type = RIG_PTT_RIG_MICDATA,
|
||||
.dcd_type = RIG_DCD_RIG,
|
||||
.port_type = RIG_PORT_SERIAL,
|
||||
.serial_rate_min = 4800,
|
||||
.serial_rate_max = 115200,
|
||||
.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 = 10,
|
||||
.preamp = {12, RIG_DBLST_END,},
|
||||
.attenuator = {12, RIG_DBLST_END,},
|
||||
.max_rit = kHz (9.99),
|
||||
.max_xit = kHz (9.99),
|
||||
.max_ifshift = Hz (0),
|
||||
.targetable_vfo = RIG_TARGETABLE_FREQ,
|
||||
.transceive = RIG_TRN_RIG,
|
||||
|
||||
|
||||
.rx_range_list1 = {
|
||||
{kHz(100), Hz(59999999), TS890_ALL_MODES, -1, -1, TS480_VFO},
|
||||
RIG_FRNG_END,
|
||||
}, /*!< Receive frequency range list for ITU region 1 */
|
||||
.tx_range_list1 = {
|
||||
{kHz(1810), kHz(1850), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, /* 100W class */
|
||||
{kHz(1810), kHz(1850), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, /* 25W class */
|
||||
{kHz(3500), kHz(3800), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(3500), kHz(3800), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(7), kHz(7200), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(7), kHz(7200), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(10100), kHz(10150), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(10100), kHz(10150), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(14), kHz(14350), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(14), kHz(14350), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(18068), kHz(18168), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(18068), kHz(18168), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(21), kHz(21450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(21), kHz(21450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(24890), kHz(24990), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(24890), kHz(24990), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(28), kHz(29700), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(28), kHz(29700), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(50), kHz(52000), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(50), kHz(52000), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
RIG_FRNG_END,
|
||||
}, /*!< Transmit frequency range list for ITU region 1 */
|
||||
.rx_range_list2 = {
|
||||
{kHz(100), Hz(59999999), TS890_ALL_MODES, -1, -1, TS480_VFO},
|
||||
RIG_FRNG_END,
|
||||
}, /*!< Receive frequency range list for ITU region 2 */
|
||||
.tx_range_list2 = {
|
||||
{kHz(1800), MHz(2) - 1, TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO}, /* 100W class */
|
||||
{kHz(1800), MHz(2) - 1, TS480_AM_TX_MODES, 5000, 25000, TS480_VFO}, /* 25W class */
|
||||
{kHz(3500), MHz(4) - 1, TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(3500), MHz(4) - 1, TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(5250), kHz(5450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(5250), kHz(5450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(7), kHz(7300), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(7), kHz(7300), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(10100), kHz(10150), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(10100), kHz(10150), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(14), kHz(14350), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(14), kHz(14350), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(18068), kHz(18168), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(18068), kHz(18168), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(21), kHz(21450), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(21), kHz(21450), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{kHz(24890), kHz(24990), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{kHz(24890), kHz(24990), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(28), kHz(29700), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(28), kHz(29700), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
{MHz(50), kHz(52000), TS480_OTHER_TX_MODES, 5000, 100000, TS480_VFO},
|
||||
{MHz(50), kHz(52000), TS480_AM_TX_MODES, 5000, 25000, TS480_VFO},
|
||||
RIG_FRNG_END,
|
||||
}, /*!< Transmit frequency range list for ITU region 2 */
|
||||
.tuning_steps = {
|
||||
{TS890_ALL_MODES,kHz(1)},
|
||||
{TS890_ALL_MODES,Hz(2500)},
|
||||
{TS890_ALL_MODES,kHz(5)},
|
||||
{TS890_ALL_MODES,Hz(6250)},
|
||||
{TS890_ALL_MODES,kHz(10)},
|
||||
{TS890_ALL_MODES,Hz(12500)},
|
||||
{TS890_ALL_MODES,kHz(15)},
|
||||
{TS890_ALL_MODES,kHz(20)},
|
||||
{TS890_ALL_MODES,kHz(25)},
|
||||
{TS890_ALL_MODES,kHz(30)},
|
||||
{TS890_ALL_MODES,kHz(100)},
|
||||
{TS890_ALL_MODES,kHz(500)},
|
||||
{TS890_ALL_MODES,MHz(1)},
|
||||
{TS890_ALL_MODES,0}, /* any tuning step */
|
||||
RIG_TS_END,
|
||||
},
|
||||
/* mode/filter list, remember: order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_SSB, kHz(2.4)},
|
||||
{RIG_MODE_CW, Hz(200)},
|
||||
{RIG_MODE_RTTY, Hz(500)},
|
||||
{RIG_MODE_AM, kHz(9)},
|
||||
{RIG_MODE_FM, kHz(14)},
|
||||
RIG_FLT_END,
|
||||
},
|
||||
.priv = (void *) &ts890s_priv_caps,
|
||||
.rig_init = kenwood_init,
|
||||
.rig_cleanup = kenwood_cleanup,
|
||||
.set_freq = kenwood_set_freq,
|
||||
.get_freq = kenwood_get_freq,
|
||||
.set_rit = kenwood_set_rit, /* FIXME should this switch to rit mode or just set the frequency? */
|
||||
.get_rit = kenwood_get_rit,
|
||||
.set_xit = kenwood_set_xit, /* FIXME should this switch to xit mode or just set the frequency? */
|
||||
.get_xit = kenwood_get_xit,
|
||||
.set_mode = kenwood_set_mode,
|
||||
.get_mode = kenwood_get_mode,
|
||||
.set_vfo = kenwood_set_vfo,
|
||||
.get_vfo = kenwood_get_vfo_if,
|
||||
.set_split_vfo = kenwood_set_split_vfo,
|
||||
.get_split_vfo = kenwood_get_split_vfo_if,
|
||||
.get_ptt = kenwood_get_ptt,
|
||||
.set_ptt = kenwood_set_ptt,
|
||||
.get_dcd = kenwood_get_dcd,
|
||||
.set_powerstat = kenwood_set_powerstat,
|
||||
.get_powerstat = kenwood_get_powerstat,
|
||||
.get_info = kenwood_ts480_get_info,
|
||||
.reset = kenwood_reset,
|
||||
.set_ant = kenwood_set_ant,
|
||||
.get_ant = kenwood_get_ant,
|
||||
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
|
||||
.has_set_level = TS480_LEVEL_ALL,
|
||||
.has_get_level = TS480_LEVEL_ALL,
|
||||
.set_level = kenwood_ts480_set_level,
|
||||
.get_level = kenwood_ts480_get_level,
|
||||
.has_get_func = TS480_FUNC_ALL,
|
||||
.has_set_func = TS480_FUNC_ALL,
|
||||
.set_func = kenwood_set_func,
|
||||
.get_func = kenwood_get_func,
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* my notes:
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue