From 829b632984f7e67cc8e4420951687c4424758281 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sat, 30 Apr 2022 10:23:49 -0500 Subject: [PATCH] Make RIG_LEVEL_TEMP a bit more generic in newcat.c --- rigs/yaesu/newcat.c | 10 +++++----- rigs/yaesu/newcat.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index da09c252a..62e2dc62a 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4944,18 +4944,18 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; case RIG_LEVEL_TEMP_METER: + if (!newcat_valid_command(rig, "RM")) + { + RETURNFUNC(-RIG_ENAVAIL); + } if (is_ftdx9000) { SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RM14%c", cat_term); } - else if (is_ftdx101d || is_ftdx101mp) + else { SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "RM9%c", cat_term); } - else - { - RETURNFUNC(-RIG_ENAVAIL); - } break; diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index 190f30958..0d79a284d 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20220428" +#define NEWCAT_VER "20220430" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129