From 056e0b2359ec67a373b649d50027b703483bfb8a Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 11 Nov 2020 07:06:51 -0600 Subject: [PATCH] Chance TSQL in newcat.c to allow more than 2 states FTDX101D has state=2 for encode-only --- include/hamlib/rig.h | 2 +- rigs/yaesu/newcat.c | 4 ++-- rigs/yaesu/newcat.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 040b953d5..9d6aada67 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -1007,7 +1007,7 @@ typedef uint64_t setting_t; #define RIG_FUNC_COMP CONSTANT_64BIT_FLAG (2) /*!< \c COMP -- Speech Compression */ #define RIG_FUNC_VOX CONSTANT_64BIT_FLAG (3) /*!< \c VOX -- Voice Operated Relay */ #define RIG_FUNC_TONE CONSTANT_64BIT_FLAG (4) /*!< \c TONE -- CTCSS Tone */ -#define RIG_FUNC_TSQL CONSTANT_64BIT_FLAG (5) /*!< \c TSQL -- CTCSS Activate/De-activate */ +#define RIG_FUNC_TSQL CONSTANT_64BIT_FLAG (5) /*!< \c TSQL -- CTCSS Activate/De-activate and Encode-only value=2 if available */ #define RIG_FUNC_SBKIN CONSTANT_64BIT_FLAG (6) /*!< \c SBKIN -- Semi Break-in (CW mode) */ #define RIG_FUNC_FBKIN CONSTANT_64BIT_FLAG (7) /*!< \c FBKIN -- Full Break-in (CW mode) */ #define RIG_FUNC_ANF CONSTANT_64BIT_FLAG (8) /*!< \c ANF -- Automatic Notch Filter (DSP) */ diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 354e6e885..fb81777fb 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4777,8 +4777,8 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) return -RIG_ENAVAIL; } - snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%d%c", status ? 1 : 0, - cat_term); + // FTDX101D has 3 states 0,1,2 + snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%d%c", status , cat_term); if (rig->caps->targetable_vfo & RIG_TARGETABLE_TONE) { diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index a1e416f02..0ddbf4de7 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20201103" +#define NEWCAT_VER "20201111" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129