From 0a7c229f068daaf1d1be93f7410f06f8c7f71bd2 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Fri, 11 Dec 2020 14:55:33 -0600 Subject: [PATCH] Fix retries in newcat.c https://github.com/Hamlib/Hamlib/issues/463 --- rigs/yaesu/newcat.c | 2 ++ rigs/yaesu/newcat.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 4e00d6ea6..0467857e9 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -8963,6 +8963,7 @@ int newcat_get_cmd(RIG *rig) __func__, priv->ret_data); // we were using BUSBUSY but microham devices need retries //rc = -RIG_BUSBUSY; /* don't write command again */ + rc = -RIG_EPROTO; /* we could decrement retry_count here but there is a danger of infinite looping so we just use up @@ -9038,6 +9039,7 @@ int newcat_get_cmd(RIG *rig) // we were using BUSBUSY but microham devices need retries // this should be OK under all other circumstances too //rc = -RIG_BUSBUSY; /* retry read only */ + rc = -RIG_EPROTO; } } diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index 9ce0859e0..0a88e03fb 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20201209" +#define NEWCAT_VER "20201211" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129