From a00cc49e10e9a8ab26e71eb94d6fcf1c9ed819de Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 26 Nov 2020 08:45:39 -0600 Subject: [PATCH] Fix kenwood retry attempts https://github.com/Hamlib/Hamlib/issues/450 (cherry picked from commit 0413a6b71fdb3ac6fb766bb3e246190d76e2d71b) --- rigs/kenwood/kenwood.c | 4 ++++ rigs/kenwood/kenwood.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 473ff0b23..f013f91a8 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -791,6 +791,7 @@ int kenwood_open(RIG *rig) if (RIG_OK != err) { rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version\n", __func__); + rig->state.rigport.retry = retry_save; return err; } @@ -806,6 +807,7 @@ int kenwood_open(RIG *rig) else { rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version\n", __func__); + rig->state.rigport.retry = retry_save; return -RIG_EPROTO; } @@ -849,6 +851,7 @@ int kenwood_open(RIG *rig) if (strlen(id) < 5) { rig_debug(RIG_DEBUG_ERR, "%s: unknown id type (%s)\n", __func__, id); + rig->state.rigport.retry = retry_save; return -RIG_EPROTO; } @@ -917,6 +920,7 @@ int kenwood_open(RIG *rig) rig_strvfo(priv->tx_vfo)); } + rig->state.rigport.retry = retry_save; return RIG_OK; } diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index c6f53b973..8dcc8bfa7 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -27,7 +27,7 @@ #include #include "token.h" -#define BACKEND_VER "20201026" +#define BACKEND_VER "20201126" #define EOM_KEN ';' #define EOM_TH '\r'