kopia lustrzana https://github.com/Hamlib/Hamlib
Increase timeout in netrigctl.c to 10000 to allow for worst case rig
Most rigs will have their timeout set to the rig's timeout plus 500ms.pull/739/head
rodzic
91b3d26837
commit
28c8b5a502
|
@ -747,8 +747,8 @@ static int netrigctl_open(RIG *rig)
|
||||||
}
|
}
|
||||||
else if (strcmp(setting, "timeout") == 0)
|
else if (strcmp(setting, "timeout") == 0)
|
||||||
{
|
{
|
||||||
// use the rig's timeout value pluse 200ms for potential network delays
|
// use the rig's timeout value pluse 500ms for potential network delays
|
||||||
rig->caps->timeout = strtol(value, NULL, 0) + 200;
|
rig->caps->timeout = strtol(value, NULL, 0) + 500;
|
||||||
rig_debug(RIG_DEBUG_TRACE, "%s: timeout value = '%s', final timeout=%d\n",
|
rig_debug(RIG_DEBUG_TRACE, "%s: timeout value = '%s', final timeout=%d\n",
|
||||||
__func__, value, rig->caps->timeout);
|
__func__, value, rig->caps->timeout);
|
||||||
}
|
}
|
||||||
|
@ -2548,7 +2548,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 = "20210613.0",
|
.version = "20210712.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_OTHER,
|
.rig_type = RIG_TYPE_OTHER,
|
||||||
|
@ -2556,8 +2556,8 @@ struct rig_caps netrigctl_caps =
|
||||||
.ptt_type = RIG_PTT_RIG_MICDATA,
|
.ptt_type = RIG_PTT_RIG_MICDATA,
|
||||||
.dcd_type = RIG_DCD_RIG,
|
.dcd_type = RIG_DCD_RIG,
|
||||||
.port_type = RIG_PORT_NETWORK,
|
.port_type = RIG_PORT_NETWORK,
|
||||||
.timeout = 3000, /* enough for the worst rig we have */
|
.timeout = 10000, /* enough for the worst rig we have */
|
||||||
.retry = 5, /* 5 seconds total */
|
.retry = 5,
|
||||||
|
|
||||||
/* following fields updated in rig_state at opening time */
|
/* following fields updated in rig_state at opening time */
|
||||||
.has_get_func = RIG_FUNC_NONE,
|
.has_get_func = RIG_FUNC_NONE,
|
||||||
|
|
Ładowanie…
Reference in New Issue