kopia lustrzana https://github.com/Hamlib/Hamlib
Add timeout to dump_state so rigctld will use the rig's timeout value plus 200ms for additional network delays
rodzic
6901bb1cda
commit
c4e37ef277
|
@ -612,6 +612,12 @@ static int netrigctl_open(RIG *rig)
|
||||||
|
|
||||||
if (!has) { rig->caps->get_freq = NULL; }
|
if (!has) { rig->caps->get_freq = NULL; }
|
||||||
}
|
}
|
||||||
|
else if (strcmp(setting, "timeout") == 0)
|
||||||
|
{
|
||||||
|
// use the rig's timeout value pluse 200ms for potential network delays
|
||||||
|
rig->caps->timeout = strtol(value, NULL, 0) + 200;
|
||||||
|
rig_debug(RIG_DEBUG_TRACE, "%s: timeout value = '%s', final timeout=%d\n", __func__, value, rig->caps->timeout);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// not an error -- just a warning for backward compatibility
|
// not an error -- just a warning for backward compatibility
|
||||||
|
@ -2288,7 +2294,7 @@ struct rig_caps netrigctl_caps =
|
||||||
RIG_MODEL(RIG_MODEL_NETRIGCTL),
|
RIG_MODEL(RIG_MODEL_NETRIGCTL),
|
||||||
.model_name = "NET rigctl",
|
.model_name = "NET rigctl",
|
||||||
.mfg_name = "Hamlib",
|
.mfg_name = "Hamlib",
|
||||||
.version = "20210326.0",
|
.version = "20210409.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_OTHER,
|
.rig_type = RIG_TYPE_OTHER,
|
||||||
|
|
|
@ -4319,6 +4319,7 @@ declare_proto_rig(dump_state)
|
||||||
fprintf(fout, "has_get_vfo=%d\n", rig->caps->get_vfo != NULL);
|
fprintf(fout, "has_get_vfo=%d\n", rig->caps->get_vfo != NULL);
|
||||||
fprintf(fout, "has_set_freq=%d\n", rig->caps->set_freq != NULL);
|
fprintf(fout, "has_set_freq=%d\n", rig->caps->set_freq != NULL);
|
||||||
fprintf(fout, "has_get_freq=%d\n", rig->caps->get_freq != NULL);
|
fprintf(fout, "has_get_freq=%d\n", rig->caps->get_freq != NULL);
|
||||||
|
fprintf(fout, "timeout=%d\n", rig->caps->timeout);
|
||||||
fprintf(fout, "done\n");
|
fprintf(fout, "done\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue