From edf0019960342cb4cf477f18aea9edca09fd4849 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 28 Feb 2021 07:38:57 -0600 Subject: [PATCH] Fix set_freq in newcat.c to not do validation on FA/FB and TX since it's done in rig.c now https://github.com/Hamlib/Hamlib/issues/575 --- rigs/yaesu/newcat.c | 9 ++++++++- rigs/yaesu/newcat.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 0151ed327..3a10edb19 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -9798,7 +9798,6 @@ int newcat_set_cmd(RIG *rig) if (rc == RIG_OK) { rig_debug(RIG_DEBUG_TRACE, "%s: cmd_validate OK\n", __func__); - RETURNFUNC(RIG_OK); } else if (rc == -RIG_EPROTO) { @@ -9820,6 +9819,14 @@ int newcat_set_cmd(RIG *rig) { RETURNFUNC(RIG_OK); } + // freq set and ptt are now verified in rig.c + if (strncmp(priv->cmd_str,"FA",2)==0 + || strncmp(priv->cmd_str,"FB",2)==0 + || strncmp(priv->cmd_str,"TX",2)==0) + { + RETURNFUNC(RIG_OK); + } + if (strncmp(priv->cmd_str, "BS", 2) == 0) { diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index 1581cb5d2..2188171fc 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20210227" +#define NEWCAT_VER "20210228" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129