[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 6f4ce3a7878cf5d2416a1b0f63e329433c6987e3

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  6f4ce3a7878cf5d2416a1b0f63e329433c6987e3 (commit)
      from  6779d04581b8c6dba61e6097c936c8c1ea471fd3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f4ce3a7878cf5d2416a1b0f63e329433c6987e3
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Jan 14 16:55:12 2021 -0600

    Have EPROTO return when newcat_set_cmd_validate fails that way
    ENIMPL will fall through
    https://github.com/Hamlib/Hamlib/issues/505

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index e8765a44..8cb7072e 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -9469,11 +9469,17 @@ int newcat_set_cmd(RIG *rig)
         /* send the command */
         rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);
 
-        if (newcat_set_cmd_validate(rig)==RIG_OK) {
+        rc =  newcat_set_cmd_validate(rig);
+        if (rc==RIG_OK) {
             rig_debug(RIG_DEBUG_TRACE, "%s: cmd_validate OK\n", __func__);
             return RIG_OK;
         }
-        rig_debug(RIG_DEBUG_TRACE, "%s: cmd_validate not OK...continuing\n", __func__);
+        else if (rc == -RIG_EPROTO)
+        {
+            rig_debug(RIG_DEBUG_TRACE, "%s: set_cmd_validate failed\n", __func__);
+            return rc;
+        }
+        rig_debug(RIG_DEBUG_TRACE, "%s: newcat_set_cmd_validate not implemented...continuing\n", __func__);
 
         if (RIG_OK != (rc = write_block(&state->rigport, priv->cmd_str,
                                         strlen(priv->cmd_str))))

-----------------------------------------------------------------------

Summary of changes:
 rigs/yaesu/newcat.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries