From 4d33abeaae869925eb6aab165aaa05283354207c Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Wed, 15 Dec 2021 17:01:35 -0600 Subject: [PATCH] Fix FTDX9000 ALC Meter --- rigs/yaesu/newcat.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 0110086ca..316f643f2 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4601,7 +4601,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) RETURNFUNC(-RIG_ENAVAIL); } - snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM4%c", cat_term); + if (is_ftdx9000) + { + snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM07%c", cat_term); + } + else + { + snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM4%c", cat_term); + } break; case RIG_LEVEL_RFPOWER_METER: @@ -9874,8 +9881,7 @@ int newcat_get_cmd(RIG *rig) || strcmp(priv->cmd_str, "RF1;") == 0 || strcmp(priv->cmd_str, "RL0;") == 0 || strcmp(priv->cmd_str, "RL1;") == 0 - || strcmp(priv->cmd_str, "RM0;") == 0 - || strcmp(priv->cmd_str, "RM1;") == 0 + || strncmp(priv->cmd_str, "RM", 2) == 0 || strcmp(priv->cmd_str, "SM0;") == 0 || strcmp(priv->cmd_str, "SM1;") == 0 || strcmp(priv->cmd_str, "SQ0;") == 0