diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index f6d49da55..591ed3db3 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -114,7 +114,7 @@ static const struct kenwood_id_string kenwood_id_string_list[] = { RIG_MODEL_TS570S, "018" }, { RIG_MODEL_TS2000, "019" }, { RIG_MODEL_TS480, "020" }, - { RIG_MODEL_PT8000A,"020" }, // TS480 ID but behaves differently + { RIG_MODEL_PT8000A, "020" }, // TS480 ID but behaves differently { RIG_MODEL_TS590S, "021" }, { RIG_MODEL_TS990S, "022" }, { RIG_MODEL_TS590SG, "023" }, @@ -781,9 +781,10 @@ int kenwood_open(RIG *rig) /* driver mismatch */ rig_debug(RIG_DEBUG_ERR, - "%s: wrong driver (%u instead of %d)\n", + "%s: not the right driver apparently (found %u, asked for %d, checked %s)\n", __func__, rig->caps->rig_model, - kenwood_id_string_list[i].model); + kenwood_id_string_list[i].model, + rig->caps->model_name); // we continue to search for other matching IDs/models } @@ -791,7 +792,9 @@ int kenwood_open(RIG *rig) rig_debug(RIG_DEBUG_ERR, "%s: your rig (%s) is unknown\n", __func__, id); - return -RIG_EPROTO; + // we're making this non fatal + // mismatched IDs can still be tested + return RIG_OK; } diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 9ccd39cfa..def3cda2b 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -27,7 +27,7 @@ #include #include "token.h" -#define BACKEND_VER "20200411" +#define BACKEND_VER "20200413" #define EOM_KEN ';' #define EOM_TH '\r' diff --git a/rigs/kenwood/r5000.c b/rigs/kenwood/r5000.c index ac9917219..666cd4d94 100644 --- a/rigs/kenwood/r5000.c +++ b/rigs/kenwood/r5000.c @@ -133,6 +133,7 @@ const struct rig_caps r5000_caps = .priv = (void *)& r5000_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = ic10_set_freq, .get_freq = ic10_get_freq, diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c index 87bf28c0d..566e91af7 100644 --- a/rigs/kenwood/thd7.c +++ b/rigs/kenwood/thd7.c @@ -170,6 +170,7 @@ const struct rig_caps thd7a_caps = .priv = (void *)& thd7_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = th_set_freq, .get_freq = th_get_freq, diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c index ad86cc5c0..16f079735 100644 --- a/rigs/kenwood/tmd700.c +++ b/rigs/kenwood/tmd700.c @@ -202,6 +202,7 @@ const struct rig_caps tmd700_caps = .priv = (void *)& tmd700_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = th_set_freq, .get_freq = th_get_freq, diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c index c707070d7..1d9139997 100644 --- a/rigs/kenwood/tmd710.c +++ b/rigs/kenwood/tmd710.c @@ -349,6 +349,7 @@ const struct rig_caps tmd710_caps = .priv = (void *)& tmd710_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = tmd710_set_freq, .get_freq = tmd710_get_freq, diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c index 6e14c1e4a..4828b2cef 100644 --- a/rigs/kenwood/trc80.c +++ b/rigs/kenwood/trc80.c @@ -150,6 +150,7 @@ const struct rig_caps trc80_caps = .priv = (void *)& trc80_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, #ifdef XXREMOVEDXX diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c index df3b31dc3..74cdf9114 100644 --- a/rigs/kenwood/ts140.c +++ b/rigs/kenwood/ts140.c @@ -172,6 +172,7 @@ const struct rig_caps ts140_caps = .priv = (void *)& ts140_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, // we don't know the ID for this rig .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts440.c b/rigs/kenwood/ts440.c index 083ee4ffa..386d79557 100644 --- a/rigs/kenwood/ts440.c +++ b/rigs/kenwood/ts440.c @@ -148,6 +148,7 @@ const struct rig_caps ts440_caps = .priv = (void *)& ts440_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = ic10_set_freq, .get_freq = ic10_get_freq, diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c index 18de8730f..792a02842 100644 --- a/rigs/kenwood/ts480.c +++ b/rigs/kenwood/ts480.c @@ -907,6 +907,7 @@ const struct rig_caps ts890s_caps = }, .priv = (void *)& ts890s_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts50s.c b/rigs/kenwood/ts50s.c index f30012f9a..fc65b2388 100644 --- a/rigs/kenwood/ts50s.c +++ b/rigs/kenwood/ts50s.c @@ -176,6 +176,7 @@ const struct rig_caps ts50s_caps = .priv = (void *)& ts50_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c index 4a36c1844..8ededb42d 100644 --- a/rigs/kenwood/ts680.c +++ b/rigs/kenwood/ts680.c @@ -178,6 +178,7 @@ const struct rig_caps ts680s_caps = .priv = (void *)& ts680_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, // we don't know the ID for this rig .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts711.c b/rigs/kenwood/ts711.c index 059c5df72..58afe83ae 100644 --- a/rigs/kenwood/ts711.c +++ b/rigs/kenwood/ts711.c @@ -190,6 +190,7 @@ const struct rig_caps ts711_caps = .priv = (void *)& ts711_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts811.c b/rigs/kenwood/ts811.c index 429d169bf..4a3c8f952 100644 --- a/rigs/kenwood/ts811.c +++ b/rigs/kenwood/ts811.c @@ -174,6 +174,7 @@ const struct rig_caps ts811_caps = .priv = (void *)& ts811_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts930.c b/rigs/kenwood/ts930.c index b96f54898..e32d6e3ca 100644 --- a/rigs/kenwood/ts930.c +++ b/rigs/kenwood/ts930.c @@ -144,6 +144,7 @@ const struct rig_caps ts930_caps = .priv = (void *)& ts930_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, // we don't know the ID for this rig .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, diff --git a/rigs/kenwood/ts940.c b/rigs/kenwood/ts940.c index 9bb0c82c8..1eae6f2df 100644 --- a/rigs/kenwood/ts940.c +++ b/rigs/kenwood/ts940.c @@ -166,6 +166,7 @@ const struct rig_caps ts940_caps = .priv = (void *)& ts940_priv_caps, .rig_init = kenwood_init, + .rig_open = kenwood_open, .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq,