From 68fb9e3c2163a67da987c04ee8029b520c7942ad Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 28 Oct 2018 15:57:28 -0500 Subject: [PATCH] Add FT-DX3000 definition and promote FT-DX5000 to Stable --- include/hamlib/riglist.h | 1 + yaesu/ft5000.c | 174 ++++++++++++++++++++++++++++++++++++++- yaesu/yaesu.c | 1 + yaesu/yaesu.h | 1 + 4 files changed, 175 insertions(+), 2 deletions(-) diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index 17bcd1be5..2bc91dd02 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -105,6 +105,7 @@ #define RIG_MODEL_FT1200 RIG_MAKE_MODEL(RIG_YAESU, 34) #define RIG_MODEL_FT991 RIG_MAKE_MODEL(RIG_YAESU, 35) #define RIG_MODEL_FT891 RIG_MAKE_MODEL(RIG_YAESU, 36) +#define RIG_MODEL_FTDX3000 RIG_MAKE_MODEL(RIG_YAESU, 37) /* diff --git a/yaesu/ft5000.c b/yaesu/ft5000.c index e04ae0284..43ab77da0 100644 --- a/yaesu/ft5000.c +++ b/yaesu/ft5000.c @@ -50,9 +50,179 @@ const struct rig_caps ftdx5000_caps = { .rig_model = RIG_MODEL_FTDX5000, .model_name = "FT-DX5000", .mfg_name = "Yaesu", - .version = NEWCAT_VER, + .version = NEWCAT_VER ".1", .copyright = "LGPL", - .status = RIG_STATUS_ALPHA, + .status = RIG_STATUS_STABLE, + .rig_type = RIG_TYPE_TRANSCEIVER, + .ptt_type = RIG_PTT_RIG, + .dcd_type = RIG_DCD_NONE, + .port_type = RIG_PORT_SERIAL, + .serial_rate_min = 4800, /* Default rate per manual */ + .serial_rate_max = 38400, + .serial_data_bits = 8, + .serial_stop_bits = 1, /* Assumed since manual makes no mention */ + .serial_parity = RIG_PARITY_NONE, + .serial_handshake = RIG_HANDSHAKE_HARDWARE, + .write_delay = FTDX5000_WRITE_DELAY, + .post_write_delay = FTDX5000_POST_WRITE_DELAY, + .timeout = 2000, + .retry = 3, + .has_get_func = FTDX5000_FUNCS, + .has_set_func = FTDX5000_FUNCS, + .has_get_level = FTDX5000_LEVELS, + .has_set_level = RIG_LEVEL_SET(FTDX5000_LEVELS), + .has_get_parm = RIG_PARM_NONE, + .has_set_parm = RIG_PARM_NONE, + .level_gran = { + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, + [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } }, + }, + .ctcss_list = common_ctcss_list, + .dcs_list = NULL, + .preamp = { 10, 20, RIG_DBLST_END, }, /* TBC */ + .attenuator = { 6, 12, 18, RIG_DBLST_END, }, + .max_rit = Hz(9999), + .max_xit = Hz(9999), + .max_ifshift = Hz(1000), + .vfo_ops = FTDX5000_VFO_OPS, + .targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, + .transceive = RIG_TRN_OFF, /* May enable later as the 5000 has an Auto Info command */ + .bank_qty = 0, + .chan_desc_sz = 0, + .str_cal = FTDX5000_STR_CAL, + .chan_list = { + { 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, + { 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */ + RIG_CHAN_END, + }, + + .rx_range_list1 = { + /* General coverage + ham, ANT_5 is RX only antenna */ + {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS|RIG_ANT_5}, + RIG_FRNG_END, + }, + + .tx_range_list1 = { + FRQ_RNG_HF(1, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), + FRQ_RNG_HF(1, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */ + FRQ_RNG_6m(1, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), + FRQ_RNG_6m(1, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */ + + RIG_FRNG_END, + }, + + .rx_range_list2 = { + {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS|RIG_ANT_5}, + RIG_FRNG_END, + }, + + .tx_range_list2 = { + FRQ_RNG_HF(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), + FRQ_RNG_HF(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */ + FRQ_RNG_6m(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), + FRQ_RNG_6m(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */ + + RIG_FRNG_END, + }, + + .tuning_steps = { + {FTDX5000_SSB_CW_RX_MODES, Hz(10)}, /* Normal */ + {FTDX5000_SSB_CW_RX_MODES, Hz(100)}, /* Fast */ + + {FTDX5000_AM_RX_MODES, Hz(100)}, /* Normal */ + {FTDX5000_AM_RX_MODES, kHz(1)}, /* Fast */ + + {FTDX5000_FM_RX_MODES, Hz(100)}, /* Normal */ + {FTDX5000_FM_RX_MODES, kHz(1)}, /* Fast */ + + RIG_TS_END, + + }, + + /* mode/filter list, .remember = order matters! */ + .filters = { + {FTDX5000_CW_RTTY_PKT_RX_MODES, Hz(1800)}, /* Normal CW, RTTY, PKT/USER */ + {FTDX5000_CW_RTTY_PKT_RX_MODES, Hz(500)}, /* Narrow CW, RTTY, PKT/USER */ + {FTDX5000_CW_RTTY_PKT_RX_MODES, Hz(2400)}, /* Wide CW, RTTY, PKT/USER */ + {RIG_MODE_SSB, Hz(2400)}, /* Normal SSB */ + {RIG_MODE_SSB, Hz(1800)}, /* Narrow SSB */ + {RIG_MODE_SSB, Hz(3000)}, /* Wide SSB */ + {RIG_MODE_AM, Hz(9000)}, /* Normal AM */ + {RIG_MODE_AM, Hz(6000)}, /* Narrow AM */ + {FTDX5000_FM_RX_MODES, Hz(15000)}, /* Normal FM */ + {FTDX5000_FM_RX_MODES, Hz(8000)}, /* Narrow FM */ + + RIG_FLT_END, + }, + + .priv = NULL, + + .rig_init = newcat_init, + .rig_cleanup = newcat_cleanup, + .rig_open = newcat_open, /* port opened */ + .rig_close = newcat_close, /* port closed */ + + .cfgparams = newcat_cfg_params, + .set_conf = newcat_set_conf, + .get_conf = newcat_get_conf, + .set_freq = newcat_set_freq, + .get_freq = newcat_get_freq, + .set_mode = newcat_set_mode, + .get_mode = newcat_get_mode, + .set_vfo = newcat_set_vfo, + .get_vfo = newcat_get_vfo, + .set_ptt = newcat_set_ptt, + .get_ptt = newcat_get_ptt, + .set_split_vfo = newcat_set_split_vfo, + .get_split_vfo = newcat_get_split_vfo, + .set_rit = newcat_set_rit, + .get_rit = newcat_get_rit, + .set_xit = newcat_set_xit, + .get_xit = newcat_get_xit, + .set_ant = newcat_set_ant, + .get_ant = newcat_get_ant, + .get_func = newcat_get_func, + .set_func = newcat_set_func, + .get_level = newcat_get_level, + .set_level = newcat_set_level, + .get_mem = newcat_get_mem, + .set_mem = newcat_set_mem, + .vfo_op = newcat_vfo_op, + .get_info = newcat_get_info, + .power2mW = newcat_power2mW, + .mW2power = newcat_mW2power, + .set_rptr_shift = newcat_set_rptr_shift, + .get_rptr_shift = newcat_get_rptr_shift, + .set_ctcss_tone = newcat_set_ctcss_tone, + .get_ctcss_tone = newcat_get_ctcss_tone, + .set_ctcss_sql = newcat_set_ctcss_sql, + .get_ctcss_sql = newcat_get_ctcss_sql, + .set_powerstat = newcat_set_powerstat, + .get_powerstat = newcat_get_powerstat, + .get_ts = newcat_get_ts, + .set_ts = newcat_set_ts, + .set_trn = newcat_set_trn, + .get_trn = newcat_get_trn, + .set_channel = newcat_set_channel, + .get_channel = newcat_get_channel, + +}; + +/* + * ft3000 rig capabilities. + * Seems to be largely compatible with the ft5000 + * So this is just a copy of the 5000 caps + * Also this struct is READONLY! + * + */ + +const struct rig_caps ftdx3000_caps = { + .rig_model = RIG_MODEL_FTDX3000, + .model_name = "FT-DX3000", + .mfg_name = "Yaesu", + .version = NEWCAT_VER ".1", + .copyright = "LGPL", + .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_NONE, diff --git a/yaesu/yaesu.c b/yaesu/yaesu.c index 7ffea3d07..ffb173148 100644 --- a/yaesu/yaesu.c +++ b/yaesu/yaesu.c @@ -96,6 +96,7 @@ DECLARE_INITRIG_BACKEND(yaesu) rig_register(&ft1000mpmkv_caps); rig_register(&ft1000mpmkvfld_caps); rig_register(&ft2000_caps); + rig_register(&ftdx3000_caps); rig_register(&ftdx5000_caps); rig_register(&ft9000_caps); rig_register(&frg100_caps); diff --git a/yaesu/yaesu.h b/yaesu/yaesu.h index 4c540837e..2125ab1c8 100644 --- a/yaesu/yaesu.h +++ b/yaesu/yaesu.h @@ -69,6 +69,7 @@ extern const struct rig_caps ft1000mpmkv_caps; extern const struct rig_caps ft1000mpmkvfld_caps; extern const struct rig_caps ft1000d_caps; extern const struct rig_caps ft2000_caps; +extern const struct rig_caps ftdx3000_caps; extern const struct rig_caps ftdx5000_caps; extern const struct rig_caps ft9000_caps; extern const struct rig_caps frg100_caps;