From ed630b28d196bcf723a52199c71b9b9f45f75f08 Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Fri, 1 Dec 2023 11:11:21 -0500 Subject: [PATCH] Revert "Fix FTDX101MP RFPOWER to allow 200W" Unnecessary code, breaks other levels. This reverts commit f255f6f8d8412c423a2fffb4864e11200f45491f. --- rigs/yaesu/newcat.c | 21 +++++++-------------- rigs/yaesu/newcat.h | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index e99a89558..6635c2a33 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4046,19 +4046,13 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) } if ( is_ftdx3000dm ) /* No separate rig->caps for this rig :-( */ - { - fpf = (int)((val.f * 50.0f) + 0.5f); - } - else if (is_ftdx101mp) - { - fpf = (int)((val.f / level_info->step.f) + 0.5f ) * 2; - if (fpf > 200) fpf = 200; - } - - else - { - fpf = (int)((val.f / level_info->step.f) + 0.5f ); - } + { + fpf = (int)((val.f * 50.0f) + 0.5f); + } + else + { + fpf = (int)((val.f / level_info->step.f) + 0.5f ); + } SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PC%03d%c", fpf, cat_term); break; @@ -5640,7 +5634,6 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) case RIG_LEVEL_RFPOWER: case RIG_LEVEL_MONITOR_GAIN: val->f = (float)atoi(retlvl) * level_info->step.f; - if (is_ftdx101mp) val->f /= 2; break; case RIG_LEVEL_BKINDL: diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index 3b30adf16..29a639eb7 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20231130" +#define NEWCAT_VER "20231101" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129