Improved FLRig error message when requesting a mode that FLRig does not have

pull/739/head
Mike Black W9MDB 2021-06-07 09:32:57 -05:00
rodzic e427262a89
commit 37b16fa283
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -144,7 +144,7 @@ const struct rig_caps flrig_caps =
RIG_MODEL(RIG_MODEL_FLRIG), RIG_MODEL(RIG_MODEL_FLRIG),
.model_name = "FLRig", .model_name = "FLRig",
.mfg_name = "FLRig", .mfg_name = "FLRig",
.version = "20210511", .version = "20210607",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .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__, "%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); 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__, rig_debug(RIG_DEBUG_TRACE, "%s matched mode=%.0f, returning '%s'\n", __func__,
(double)modeHamlib, modeMap[i].mode_flrig); (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)); rig_strrmode(modeHamlib));
return ("ERROR"); return ("ERROR");
} }