[Hamlib-commits] Hamlib -- Ham radio control libraries branch, master, updated. aeb726e53c8388e4b93
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch, master, updated. aeb726e53c8388e4b9330c19bf6d83a7b3e39e4c
|
From: Nate B. <n0...@us...> - 2017-01-07 15:14:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via aeb726e53c8388e4b9330c19bf6d83a7b3e39e4c (commit)
via f1a9644d2361337ef3c53f15b95617da403b1c9d (commit)
from 0b418a2be8bc86d260f68ae9248ef019778f489b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aeb726e53c8388e4b9330c19bf6d83a7b3e39e4c
Merge: 0b418a2 f1a9644
Author: Nate Bargmann <n0...@n0...>
Date: Sat Jan 7 09:12:54 2017 -0600
Merge branch 'mdblack98-master'
New model, FT-891 from Mike, W9MDB.
commit f1a9644d2361337ef3c53f15b95617da403b1c9d
Author: Michael Black <mdb...@ya...>
Date: Fri Jan 6 11:20:38 2017 -0600
Added ft891 backend
diff --git a/NEWS b/NEWS
index da9e405..aa69d7b 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Version 3.2
2017-06-30
* New models, IC-7850/IC-7851 in IC-785x. Mike, W9MDB
* Fix ft991_get_mode, Mike, W9MDB
+ * New model, FT-891. Mike, W9MDB
Version 3.1
2016-12-31
diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index dc32dd4..7f499fc 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -97,6 +97,7 @@
#define RIG_MODEL_VX1700 RIG_MAKE_MODEL(RIG_YAESU, 33)
#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)
/*
* Kenwood
diff --git a/yaesu/Makefile.am b/yaesu/Makefile.am
index be00e63..77a6468 100644
--- a/yaesu/Makefile.am
+++ b/yaesu/Makefile.am
@@ -9,7 +9,8 @@ YAESUSRC = ft100.c ft100.h ft747.c ft747.h ft817.c ft817.h ft847.c ft847.h \
## Yaesu radios that use the new Kenwood style CAT commands
NEWCATSRC = newcat.c newcat.h ft450.c ft450.h ft950.c ft950.h ft991.c ft991.h \
- ft2000.c ft2000.h ft9000.c ft9000.h ft5000.c ft5000.h ft1200.c ft1200.h
+ ft2000.c ft2000.h ft9000.c ft9000.h ft5000.c ft5000.h ft1200.c ft1200.h \
+ ft891.c ft891.h
noinst_LTLIBRARIES = libhamlib-yaesu.la
libhamlib_yaesu_la_SOURCES = $(YAESUSRC) $(NEWCATSRC) yaesu.c yaesu.h
diff --git a/yaesu/ft891.c b/yaesu/ft891.c
new file mode 100644
index 0000000..bcc906e
--- /dev/null
+++ b/yaesu/ft891.c
@@ -0,0 +1,473 @@
+/*
+ * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
+ *
+ * ft891.c - (C) Nate Bargmann 2007 (n0nb at arrl.net)
+ * (C) Stephane Fillod 2008
+ * (C) Terry Embry 2008-2009
+ * (C) Michael Black W9MDB 2016 -- taken from ft991c
+ *
+ * The FT891 is very much like the FT991
+ * So most of this code is a duplicate of the FT991
+ *
+ * This shared library provides an API for communicating
+ * via serial interface to an FT-891 using the "CAT" interface
+ *
+ *
+ * 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 <string.h>
+#include "hamlib/rig.h"
+#include "bandplan.h"
+#include "serial.h"
+#include "misc.h"
+#include "yaesu.h"
+#include "newcat.h"
+#include "ft891.h"
+#include "idx_builtin.h"
+
+/*
+ * ft891 rigs capabilities.
+ * Also this struct is READONLY!
+ *
+ */
+
+const struct rig_caps ft891_caps = {
+ .rig_model = RIG_MODEL_FT891,
+ .model_name = "FT-891",
+ .mfg_name = "Yaesu",
+ .version = NEWCAT_VER ".1",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_BETA,
+ .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 = FT891_WRITE_DELAY,
+ .post_write_delay = FT891_POST_WRITE_DELAY,
+ .timeout = 2000,
+ .retry = 3,
+ .has_get_func = FT891_FUNCS,
+ .has_set_func = FT891_FUNCS,
+ .has_get_level = FT891_LEVELS,
+ .has_set_level = RIG_LEVEL_SET(FT891_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 = FT891_VFO_OPS,
+ .targetable_vfo = RIG_TARGETABLE_FREQ,
+ .transceive = RIG_TRN_OFF, /* May enable later as the 950 has an Auto Info command */
+ .bank_qty = 0,
+ .chan_desc_sz = 0,
+ .str_cal = FT891_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 = {
+ {kHz(30), MHz(470), FT891_ALL_RX_MODES, -1, -1, FT891_VFO_ALL, FT891_ANTS}, /* General coverage + ham */
+ RIG_FRNG_END,
+ }, /* FIXME: Are these the correct Region 1 values? */
+
+ .tx_range_list1 = {
+ FRQ_RNG_HF(1, FT891_OTHER_TX_MODES, W(5), W(100), FT891_VFO_ALL, FT891_ANTS),
+ FRQ_RNG_HF(1, FT891_AM_TX_MODES, W(2), W(25), FT891_VFO_ALL, FT891_ANTS), /* AM class */
+ FRQ_RNG_6m(1, FT891_OTHER_TX_MODES, W(5), W(100), FT891_VFO_ALL, FT891_ANTS),
+ FRQ_RNG_6m(1, FT891_AM_TX_MODES, W(2), W(25), FT891_VFO_ALL, FT891_ANTS), /* AM class */
+
+ RIG_FRNG_END,
+ },
+
+ .rx_range_list2 = {
+ {kHz(30), MHz(470), FT891_ALL_RX_MODES, -1, -1, FT891_VFO_ALL, FT891_ANTS},
+ RIG_FRNG_END,
+ },
+
+ .tx_range_list2 = {
+ FRQ_RNG_HF(2, FT891_OTHER_TX_MODES, W(5), W(100), FT891_VFO_ALL, FT891_ANTS),
+ FRQ_RNG_HF(2, FT891_AM_TX_MODES, W(2), W(25), FT891_VFO_ALL, FT891_ANTS), /* AM class */
+ FRQ_RNG_6m(2, FT891_OTHER_TX_MODES, W(5), W(100), FT891_VFO_ALL, FT891_ANTS),
+ FRQ_RNG_6m(2, FT891_AM_TX_MODES, W(2), W(25), FT891_VFO_ALL, FT891_ANTS), /* AM class */
+
+ RIG_FRNG_END,
+ },
+
+ .tuning_steps = {
+ {FT891_SSB_CW_RX_MODES, Hz(10)}, /* Normal */
+ {FT891_SSB_CW_RX_MODES, Hz(100)}, /* Fast */
+
+ {FT891_AM_RX_MODES, Hz(100)}, /* Normal */
+ {FT891_AM_RX_MODES, kHz(1)}, /* Fast */
+
+ {FT891_FM_RX_MODES, Hz(100)}, /* Normal */
+ {FT891_FM_RX_MODES, kHz(1)}, /* Fast */
+
+ RIG_TS_END,
+
+ },
+
+ /* mode/filter list, .remember = order matters! */
+ .filters = {
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(1700)}, /* Normal CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(500)}, /* Narrow CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(2400)}, /* Wide CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(2000)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(1400)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(1200)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(800)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(400)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(300)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(200)}, /* CW, RTTY, PKT */
+ {FT891_CW_RTTY_PKT_RX_MODES, Hz(100)}, /* CW, RTTY, PKT */
+ {RIG_MODE_SSB, Hz(2400)}, /* Normal SSB */
+ {RIG_MODE_SSB, Hz(1800)}, /* Narrow SSB */
+ {RIG_MODE_SSB, Hz(3000)}, /* Wide SSB */
+ {RIG_MODE_SSB, Hz(2900)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2800)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2700)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2600)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2500)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2250)}, /* SSB */
+ {RIG_MODE_SSB, Hz(2100)}, /* SSB */
+ {RIG_MODE_SSB, Hz(1950)}, /* SSB */
+ {RIG_MODE_SSB, Hz(1650)}, /* SSB */
+ {RIG_MODE_SSB, Hz(1500)}, /* SSB */
+ {RIG_MODE_SSB, Hz(1350)}, /* SSB */
+ {RIG_MODE_SSB, Hz(1100)}, /* SSB */
+ {RIG_MODE_SSB, Hz(850)}, /* SSB */
+ {RIG_MODE_SSB, Hz(600)}, /* SSB */
+ {RIG_MODE_SSB, Hz(400)}, /* SSB */
+ {RIG_MODE_SSB, Hz(200)}, /* SSB */
+ {RIG_MODE_AM, Hz(9000)}, /* Normal AM */
+ {RIG_MODE_AM, Hz(6000)}, /* Narrow AM */
+ {FT891_FM_RX_MODES, Hz(16000)}, /* Normal FM */
+ {FT891_FM_RX_MODES, Hz(9000)}, /* Narrow FM */
+
+ RIG_FLT_END,
+ },
+
+ .priv = NULL, /* private data FIXME: */
+
+ .rig_init = ft891_init,
+ .rig_cleanup = newcat_cleanup,
+ .rig_open = newcat_open, /* port opened */
+ .rig_close = newcat_close, /* port closed */
+
+ .set_freq = newcat_set_freq,
+ .get_freq = newcat_get_freq,
+ .set_mode = ft891_set_mode,
+ .get_mode = newcat_get_mode,
+ .get_vfo = newcat_get_vfo,
+ .set_ptt = newcat_set_ptt,
+ .get_ptt = newcat_get_ptt,
+ .set_split_vfo = ft891_set_split_vfo,
+ .get_split_vfo = ft891_get_split_vfo,
+ .get_split_mode = ft891_get_split_mode,
+ .set_split_mode = ft891_set_split_mode,
+ .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,
+ .set_ts = newcat_set_ts,
+ .get_ts = newcat_get_ts,
+ .set_trn = newcat_set_trn,
+ .get_trn = newcat_get_trn,
+ .set_channel = newcat_set_channel,
+ .get_channel = newcat_get_channel,
+
+};
+
+/*
+ * rig_set_split_vfo*
+ *
+ * Set split operation for a given VFO
+ *
+ * Parameter | Type | Accepted/Expected Values
+ * -------------------------------------------------------------------------
+ * RIG * | input | pointer to private data
+ * vfo | input | currVFO, VFOA, VFOB, MEM
+ * split | input | 0 = off, 1 = on
+ * tx_vfo | input | currVFO, VFOA, VFOB
+ * -------------------------------------------------------------------------
+ * Returns RIG_OK on success or an error code on failure
+ *
+ * Comments: Passing currVFO to vfo or tx_vfo will use the currently
+ * selected VFO obtained from the priv->current_vfo data structure.
+ * Only VFOA and VFOB are valid assignments for the tx_vfo.
+ * The tx_vfo is loaded first when assigning MEM to vfo to ensure
+ * the correct TX VFO is selected by the rig in split mode.
+ * An error is returned if vfo and tx_vfo are the same.
+ */
+int ft891_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
+{
+ struct newcat_priv_data *priv;
+ struct rig_state *state;
+ unsigned char ci;
+ int err;
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ if (!rig)
+ return -RIG_EINVAL;
+
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed split = 0x%02x\n", __func__, split);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed tx_vfo = 0x%02x\n", __func__, tx_vfo);
+
+ priv = (struct newcat_priv_data *)rig->state.priv;
+ state = &rig->state;
+
+ // RX VFO and TX VFO cannot be the same, no support for MEM as TX VFO
+ if (vfo == tx_vfo || tx_vfo == RIG_VFO_MEM)
+ return -RIG_ENTARGET;
+
+ switch(split) {
+ case RIG_SPLIT_ON:
+ ci = '3';
+ break;
+ case RIG_SPLIT_OFF:
+ ci = '2';
+ break;
+ default:
+ return -RIG_EINVAL;
+ }
+
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "FT%c;", ci);
+ if ( RIG_OK != (err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str)))) {
+ rig_debug(RIG_DEBUG_ERR, "%s: write_block err = %d\n", __func__, err);
+ return err;
+ }
+
+ return RIG_OK;
+}
+
+/*
+ * rig_get_split_vfo*
+ *
+ * Get split mode status for a given VFO
+ *
+ * Parameter | Type | Accepted/Expected Values
+ * -------------------------------------------------------------------------
+ * RIG * | input | pointer to private data
+ * vfo | input | currVFO, Main, VFO, VFOA, VFOB, MEM
+ * split * | output | 0 = on, 1 = off
+ * tx_vfo * | output | VFOA, VFOB
+ * -------------------------------------------------------------------------
+ * Returns RIG_OK on success or an error code on failure
+ *
+ * Comments: The passed value for the vfo is ignored since can only split one way
+ */
+int ft891_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
+{
+ struct newcat_priv_data *priv;
+ int err;
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ if (!rig)
+ return -RIG_EINVAL;
+
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo);
+
+ priv = (struct newcat_priv_data *)rig->state.priv;
+
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "FT;");
+ if (RIG_OK != (err = newcat_get_cmd (rig)))
+ return err;
+
+ // Get split mode status
+ *split = priv->ret_data[2]=='1'; // 1=VFOB TX so is in split mode
+ rig_debug(RIG_DEBUG_TRACE, "%s: get split = 0x%02x\n", __func__, *split);
+
+ *tx_vfo = RIG_VFO_A;
+ if (*split) *tx_vfo = RIG_VFO_B;
+ rig_debug(RIG_DEBUG_TRACE, "%s: get tx_vfo = 0x%02x\n", __func__, *tx_vfo);
+
+ return RIG_OK;
+}
+
+/*
+ * rig_get_split_mode*
+ *
+ * Get the '891 split TX mode
+ *
+ * Parameter | Type | Accepted/expected values
+ * ------------------------------------------------------------------
+ * *rig | input | pointer to private data
+ * vfo | input | currVFO, VFOA, VFOB, MEM
+ * *tx_mode | output | supported modes
+ * *tx_width | output | supported widths
+ * ------------------------------------------------------------------
+ * Returns RIG_OK on success or an error code on failure
+ *
+ * Comments: Checks to see if the 891 is in split mode, if so it
+ * checks which VFO is set for TX and then gets the
+ * mode and passband of that VFO and stores it into *tx_mode
+ * and tx_width respectively. If not in split mode returns
+ * RIG_MODE_NONE and 0 Hz.
+ *
+ */
+
+int ft891_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, pbwidth_t *tx_width)
+{
+ struct newcat_priv_data *priv;
+ int err;
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ if (!rig)
+ return -RIG_EINVAL;
+
+ priv = (struct newcat_priv_data *)rig->state.priv;
+
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "OI;");
+ if (RIG_OK != (err = newcat_get_cmd (rig)))
+ return err;
+ *tx_mode = priv->ret_data[22];
+
+ return RIG_OK;
+}
+
+/*
+ * rig_set_split_mode
+ *
+ * Set the '891 split TX mode
+ *
+ * Parameter | Type | Accepted/expected values
+ * ------------------------------------------------------------------
+ * *rig | input | pointer to private data
+ * vfo | input | currVFO, VFOA, VFOB, MEM
+ * tx_mode | input | supported modes
+ * tx_width | input | supported widths
+ * ------------------------------------------------------------------
+ * Returns RIG_OK on success or an error code on failure
+ *
+ * Comments: Passsband is not set here.
+ * FT891 apparentlhy cannot set VFOB mode directly
+ * So we'll just set A and swap A into B
+ *
+ */
+
+int ft891_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t tx_width)
+{
+ struct newcat_priv_data *priv;
+ struct rig_state *state;
+ int err;
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ if (!rig)
+ return -RIG_EINVAL;
+ state = &rig->state;
+
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %i\n", __func__, tx_mode);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed width = %li Hz\n", __func__, tx_width);
+
+ priv = (struct newcat_priv_data *)rig->state.priv;
+
+ // Change mode on VFOA and make VFOB match VFOA
+ if (RIG_OK != (err = newcat_set_mode(rig,RIG_VFO_A,tx_mode,tx_width))) {
+ return err;
+ }
+ // Copy A to B
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AB;");
+ if (RIG_OK != (err = write_block(&state->rigport, priv->cmd_str, strlen(priv->cmd_str))))
+ {
+ rig_debug(RIG_DEBUG_VERBOSE, "%s:%d write_block err = %d\n", __func__, __LINE__, err);
+ return err;
+ }
+
+#if 0
+ if (RIG_OK != (err = newcat_get_cmd (rig)))
+ return err;
+#endif
+ return RIG_OK;
+}
+
+
+int ft891_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
+{
+ struct newcat_priv_data *priv;
+ int err;
+
+ // FT891 can't set VFOB mode directly so we always set VFOA
+ // We will always make VFOB match VFOA mode
+ newcat_set_mode(rig, RIG_VFO_A, mode, width);
+
+ priv = (struct newcat_priv_data *)rig->state.priv;
+
+ // Copy A to B
+ snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AB;");
+ if (RIG_OK != (err = newcat_get_cmd (rig)))
+ return err;
+ return RIG_OK;
+}
+
+int ft891_init(RIG *rig) {
+ struct newcat_priv_data *priv;
+ rig_debug(RIG_DEBUG_VERBOSE,"%s called, version %s\n", __func__,rig->caps->version);
+ int ret = newcat_init(rig);
+ if (ret != RIG_OK) return ret;
+ priv = (struct newcat_priv_data *)rig->state.priv;
+ priv->width_frequency = 9;
+ priv->offset_rit = 13;
+ rig->state.current_vfo = RIG_VFO_A;
+ return RIG_OK;
+}
diff --git a/yaesu/ft891.h b/yaesu/ft891.h
new file mode 100644
index 0000000..9e5950c
--- /dev/null
+++ b/yaesu/ft891.h
@@ -0,0 +1,134 @@
+/*
+ * hamlib - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
+ *
+ * ft891.h - (C) Nate Bargmann 2007 (n0nb at arrl.net)
+ * (C) Stephane Fillod 2008
+ *
+ * This shared library provides an API for communicating
+ * via serial interface to an FT-950 using the "CAT" interface
+ *
+ *
+ * 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
+ *
+ */
+
+
+#ifndef _FT891_H
+#define _FT891_H 1
+
+#define TRUE 1
+#define FALSE 0
+#define ON TRUE
+#define OFF FALSE
+
+#define FT891_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
+
+/* Receiver caps */
+
+#define FT891_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
+ RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM)
+#define FT891_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
+ RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
+#define FT891_AM_RX_MODES (RIG_MODE_AM)
+#define FT891_FM_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM)
+#define FT891_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR)
+#define FT891_CW_RTTY_PKT_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|\
+ RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|RIG_MODE_CW|RIG_MODE_CWR)
+
+/* TRX caps */
+
+#define FT891_OTHER_TX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB | RIG_MODE_PKTUSB | RIG_MODE_PKTLSB ) /* 100 W class */
+#define FT891_AM_TX_MODES (RIG_MODE_AM) /* set 25W max */
+
+#define FT891_LEVELS (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|RIG_LEVEL_STRENGTH|\
+ RIG_LEVEL_ALC|RIG_LEVEL_RAWSTR|RIG_LEVEL_SWR|\
+ RIG_LEVEL_RFPOWER|RIG_LEVEL_RF|RIG_LEVEL_SQL|\
+ RIG_LEVEL_MICGAIN|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH|\
+ RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
+ RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
+ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
+ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF)
+
+#define FT891_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\
+ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
+ RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN)
+
+#define FT891_VFO_OPS (RIG_OP_TUNE|RIG_OP_CPY|RIG_OP_XCHG|\
+ RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\
+ RIG_OP_TO_VFO|RIG_OP_FROM_VFO)
+
+/* TBC */
+#define FT891_STR_CAL { 16, \
+ { \
+ { 0, -54 }, /* S0 */ \
+ { 12, -48 }, /* S1 */ \
+ { 27, -42 }, /* S2 */ \
+ { 40, -36 }, /* S3 */ \
+ { 55, -30 }, /* S4 */ \
+ { 65, -24 }, /* S5 */ \
+ { 80, -18 }, /* S6 */ \
+ { 95, -12 }, /* S7 */ \
+ { 112, -6 }, /* S8 */ \
+ { 130, 0 }, /* S9 */ \
+ { 150, 10 }, /* +10 */ \
+ { 172, 20 }, /* +20 */ \
+ { 190, 30 }, /* +30 */ \
+ { 220, 40 }, /* +40 */ \
+ { 240, 50 }, /* +50 */ \
+ { 255, 60 }, /* +60 */ \
+ } }
+
+
+/*
+ * Other features (used by rig_caps)
+ *
+ */
+
+#define FT891_ANTS (RIG_ANT_1|RIG_ANT_2)
+
+#define FT891_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */
+#define FT891_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */
+#define FT891_VFO_DATA_LENGTH 18 /* 0x10 P1 = 03 return size -- A & B returned */
+#define FT891_MEM_CHNL_DATA_LENGTH 19 /* 0x10 P1 = 04, P4 = 0x01-0x20 return size */
+#define FT891_STATUS_FLAGS_LENGTH 5 /* 0xf7, 0xfa return size */
+#define FT891_ALL_DATA_LENGTH 649 /* 0x10 P1 = 00 return size */
+
+/* Timing values in mS */
+
+// #define FT891_PACING_INTERVAL 5
+// #define FT891_PACING_DEFAULT_VALUE 0
+
+/* Delay between bytes sent to FT-891
+ * Should not exceed value set in CAT TOT menu (rig default is 10 mSec)
+ */
+#define FT891_WRITE_DELAY 0
+
+
+/* Delay sequential fast writes */
+
+#define FT891_POST_WRITE_DELAY 50
+
+/* Prototypes */
+int ft891_init(RIG *rig);
+static int ft891_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo);
+static int ft891_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, pbwidth_t *tx_width);
+static int ft891_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t tx_width);
+static int ft891_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
+static int ft891_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo);
+
+/* Reuse newcat_get_cmd */
+extern int newcat_get_cmd(RIG *rig);
+
+#endif /* _FT891_H */
diff --git a/yaesu/yaesu.c b/yaesu/yaesu.c
index ed0ed84..93d936d 100644
--- a/yaesu/yaesu.c
+++ b/yaesu/yaesu.c
@@ -105,6 +105,7 @@ DECLARE_INITRIG_BACKEND(yaesu)
rig_register(&vx1700_caps);
rig_register(&ft1200_caps);
rig_register(&ft991_caps);
+ rig_register(&ft891_caps);
return RIG_OK;
}
diff --git a/yaesu/yaesu.h b/yaesu/yaesu.h
index cc84e5d..4c54083 100644
--- a/yaesu/yaesu.h
+++ b/yaesu/yaesu.h
@@ -57,6 +57,7 @@ extern const struct rig_caps ft897_caps;
extern const struct rig_caps ft847_caps;
extern const struct rig_caps ft840_caps;
extern const struct rig_caps ft890_caps;
+extern const struct rig_caps ft891_caps;
extern const struct rig_caps ft900_caps;
extern const struct rig_caps ft920_caps;
extern const struct rig_caps ft950_caps;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
include/hamlib/riglist.h | 1 +
yaesu/Makefile.am | 3 +-
yaesu/{ft991.c => ft891.c} | 146 ++++++++++++++++++++-----------------------
yaesu/{ft991.h => ft891.h} | 70 +++++++++++-----------
yaesu/yaesu.c | 1 +
yaesu/yaesu.h | 1 +
7 files changed, 109 insertions(+), 114 deletions(-)
copy yaesu/{ft991.c => ft891.c} (76%)
copy yaesu/{ft991.h => ft891.h} (63%)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
