From 37b16fa283602f176fd7b82d1e095b356b1ac957 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 7 Jun 2021 09:32:57 -0500 Subject: [PATCH] Improved FLRig error message when requesting a mode that FLRig does not have --- rigs/dummy/flrig.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index fa72bcb67..5f3b8024b 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -144,7 +144,7 @@ const struct rig_caps flrig_caps = RIG_MODEL(RIG_MODEL_FLRIG), .model_name = "FLRig", .mfg_name = "FLRig", - .version = "20210511", + .version = "20210607", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -674,7 +674,7 @@ static const char *modeMapGetFLRig(rmode_t modeHamlib) "%s: checking modeMap[%d]=%.0f to modeHamlib=%.0f, mode_flrig='%s'\n", __func__, i, (double)modeMap[i].mode_hamlib, (double)modeHamlib, modeMap[i].mode_flrig); - if (modeMap[i].mode_hamlib == modeHamlib) + if (modeMap[i].mode_hamlib == modeHamlib && strlen(modeMap[i].mode_flrig) > 0) { rig_debug(RIG_DEBUG_TRACE, "%s matched mode=%.0f, returning '%s'\n", __func__, (double)modeHamlib, modeMap[i].mode_flrig); @@ -682,7 +682,7 @@ static const char *modeMapGetFLRig(rmode_t modeHamlib) } } - rig_debug(RIG_DEBUG_ERR, "%s: Unknown mode requested: %s\n", __func__, + rig_debug(RIG_DEBUG_ERR, "%s: FlRig does not have mode: %s\n", __func__, rig_strrmode(modeHamlib)); return ("ERROR"); }