From 4677fb16d471043cc500c4e7737722387320a3c9 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 19 Jul 2022 23:25:56 -0500 Subject: [PATCH] Change FTDX5000 to RIG_PTT_RIG_MICDATA and add logic to newcat. --- rigs/yaesu/ft5000.c | 4 ++-- rigs/yaesu/newcat.c | 11 +++++++++++ rigs/yaesu/newcat.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c index eaeb7c7aa..488e3f355 100644 --- a/rigs/yaesu/ft5000.c +++ b/rigs/yaesu/ft5000.c @@ -140,11 +140,11 @@ const struct rig_caps ftdx5000_caps = RIG_MODEL(RIG_MODEL_FTDX5000), .model_name = "FTDX-5000", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".4", + .version = NEWCAT_VER ".5", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, - .ptt_type = RIG_PTT_RIG, + .ptt_type = RIG_PTT_RIG_MICDATA, .dcd_type = RIG_DCD_NONE, .port_type = RIG_PORT_SERIAL, .serial_rate_min = 4800, /* Default rate per manual */ diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 0bf467836..2ef422eb6 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -1695,6 +1695,17 @@ int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) switch (ptt) { + // the FTDX5000 uses menu 103 for front/rear audio in USB mode + case RIG_PTT_ON_MIC: + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1030;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + err = newcat_set_cmd(rig); + break; + case RIG_PTT_ON_DATA: + SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "EX1031;"); + rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str); + err = newcat_set_cmd(rig); + break; case RIG_PTT_ON: /* Build the command string */ SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", txon); diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index ff9350b3b..6e3c177f7 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20220709" +#define NEWCAT_VER "20220719" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129