From 9f4be67d4b3e35dd435a445e11b38a5ba11b7e3e Mon Sep 17 00:00:00 2001 From: Mikael Nousiainen Date: Fri, 23 Oct 2020 10:04:06 +0300 Subject: [PATCH] Fix COMP func (cherry picked from commit f2d89ab7cebd4b4aa9acdb75a600d46c255fac33) --- rigs/yaesu/newcat.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 5e875c288..72d481968 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -3916,13 +3916,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) return -RIG_ENAVAIL; } - if (is_ft1200 || is_ft3000 || is_ft991 || is_ft101) - { - // 1 = OFF, 2 = ON for these rigs - snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%d%c", status ? 2 : 1, - cat_term); - } - else if (is_ft891) + if (is_ft1200 || is_ft3000 || is_ft891 || is_ft991 || is_ft101) { snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PR0%d%c", status ? 1 : 0, cat_term); @@ -4201,12 +4195,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) break; case RIG_FUNC_COMP: - if (is_ft1200 || is_ft3000 || is_ft991 || is_ft101) - { - // The return values are 1=OFF and 2=ON for these rigs - *status = (retfunc[1] == '2') ? 1 : 0; - } - else if (is_ft891) + if (is_ft1200 || is_ft3000 || is_ft891 || is_ft991 || is_ft101) { *status = (retfunc[1] == '1') ? 1 : 0; }