Fix rotctl set_conf

pull/224/head
Michael Black 2020-03-10 08:43:42 -05:00
rodzic e704f7783c
commit f46067977a
2 zmienionych plików z 11 dodań i 7 usunięć

Wyświetl plik

@ -543,7 +543,7 @@ const struct confparams *HAMLIB_API rot_confparam_lookup(ROT *rot,
const struct confparams *cfp;
token_t token;
rot_debug(RIG_DEBUG_VERBOSE, "%s called lookup=%s\n", __func__, name);
//rot_debug(RIG_DEBUG_VERBOSE, "%s called lookup=%s\n", __func__, name);
if (!rot || !rot->caps)
{
@ -553,16 +553,20 @@ const struct confparams *HAMLIB_API rot_confparam_lookup(ROT *rot,
/* 0 returned for invalid format */
token = strtol(name, NULL, 0);
//rig_debug(RIG_DEBUG_TRACE, "%s: token=%d\n", __func__, (int)token);
for (cfp = rot->caps->cfgparams; cfp && cfp->name; cfp++)
{
//rig_debug(RIG_DEBUG_TRACE, "%s: name=%s cfp->name=%s cfp->token=%d, token=%d\n", __func__, name, cfp->name, (int)cfp->token, (int)token);
if (!strcmp(cfp->name, name) || token == cfp->token)
{
return cfp;
}
}
//rig_debug(RIG_DEBUG_TRACE, "%s: frontend check\n", __func__);
for (cfp = rotfrontend_cfg_params; cfp->name; cfp++)
{
//rig_debug(RIG_DEBUG_TRACE, "%s: name=%s cfp->name=%s cfp->token=%d, token=%d\n", __func__, name, cfp->name, (int)cfp->token, (int)token);
if (!strcmp(cfp->name, name) || token == cfp->token)
{
return cfp;

Wyświetl plik

@ -1653,14 +1653,14 @@ int set_conf(ROT *my_rot, char *conf_parms)
if (!q)
{
return RIG_EINVAL;
}
*q++ = '\0';
n = strchr(q, ',');
*q++ = '\0';
n = strchr(q, ',');
if (n)
{
*n++ = '\0';
}
if (n)
{
*n++ = '\0';
}
rig_debug(RIG_DEBUG_TRACE, "%s: token=%s, val=%s\n", __func__, p, q);