From 982f88035c639fddec5244f80758ed1a9b5c9f2b Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 11 Feb 2022 12:14:19 -0600 Subject: [PATCH] Allow FV command to fail for TS-590S and default firmwave rev to 1.0 --- rigs/kenwood/kenwood.c | 11 +++++++---- rigs/kenwood/kenwood.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 881ac9141..67b8902a1 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -831,10 +831,12 @@ int kenwood_open(RIG *rig) if (RIG_OK != err) { - rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version\n", __func__); + rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version, defaulting to 1.0\n", __func__); rig->state.rigport.retry = retry_save; - RETURNFUNC(err); + priv->fw_rev_uint = 100; } + else + { /* store the data after the "FV" which should be a f/w version string of the form n.n e.g. 1.07 */ @@ -851,9 +853,10 @@ int kenwood_open(RIG *rig) rig->state.rigport.retry = retry_save; RETURNFUNC(-RIG_EPROTO); } + } - rig_debug(RIG_DEBUG_TRACE, "%s: found f/w version %s\n", __func__, - priv->fw_rev); + rig_debug(RIG_DEBUG_TRACE, "%s: found f/w version %.1f\n", __func__, + priv->fw_rev_uint/100.0); } if (!RIG_IS_XG3 && -RIG_ETIMEOUT == err) diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index c3e1a463d..d39ffea64 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -28,7 +28,7 @@ #include "token.h" #include "misc.h" -#define BACKEND_VER "20220206" +#define BACKEND_VER "20220211" #define EOM_KEN ';' #define EOM_TH '\r'