From f443e28c6ece4946f6484d12e86a7b9a1e8213aa Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 11 Jun 2020 17:27:36 -0500 Subject: [PATCH] Add one more exception for the FTDX101D ST command --- rigs/yaesu/newcat.c | 11 +++++++++-- rigs/yaesu/newcat.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 0ec7bac77..7920f8878 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4724,6 +4724,7 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo) struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv; int err; char p1; + char *command = "FT"; rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); @@ -4780,7 +4781,13 @@ int newcat_set_tx_vfo(RIG *rig, vfo_t tx_vfo) p1 = p1 + 2; /* use non-Toggle commands */ } - snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", "FT", p1, cat_term); + if (is_ft101) + { + // what other Yaeus rigs should be using this? + // The DX101D returns FT0 when in split and not transmitting + command = "ST"; + } + snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", command, p1, cat_term); rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str); @@ -4800,7 +4807,7 @@ int newcat_get_tx_vfo(RIG *rig, vfo_t *tx_vfo) vfo_t vfo_mode; char const *command = "FT"; - if (rig->caps->rig_model == RIG_MODEL_FTDX101D) + if (is_ft101) { // what other Yaeus rigs should be using this? // The DX101D returns FT0 when in split and not transmitting diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index a2d05a767..3d1b692a4 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20200610" +#define NEWCAT_VER "20200611" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129