mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix error codes to allow retries in newcat_get_cmd

pull/507/head
Mikael Nousiainen 2021-01-12 22:13:11 +02:00
rodzic dd4076355d
commit c1a0e15464
1 zmienionych plików z 4 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
rigs/yaesu/newcat.c
Wyświetl plik

@ -9085,19 +9085,17 @@ int newcat_get_cmd(RIG *rig)
rc = RIG_OK; /* received something */ rc = RIG_OK; /* received something */
/* Check that command termination is correct - alternative is /* Check that command termination is correct - alternative is
response is longer that the buffer */ response is longer than the buffer */
if (cat_term != priv->ret_data[strlen(priv->ret_data) - 1]) if (cat_term != priv->ret_data[strlen(priv->ret_data) - 1])
{ {
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n",
__func__, priv->ret_data); __func__, priv->ret_data);
// we were using BUSBUSY but microham devices need retries rc = -RIG_EPROTO; /* retry */
//rc = -RIG_BUSBUSY; /* don't write command again */
// rc = -RIG_EPROTO;
/* we could decrement retry_count /* we could decrement retry_count
here but there is a danger of here but there is a danger of
infinite looping so we just use up infinite looping so we just use up
a retry for safety's sake */ a retry for safety's sake */
continue; /* retry */ continue;
} }
/* check for error codes */ /* check for error codes */
@ -9158,7 +9156,7 @@ int newcat_get_cmd(RIG *rig)
rig_debug(RIG_DEBUG_WARN, "%s: Rig busy - retrying: '%s'\n", __func__, rig_debug(RIG_DEBUG_WARN, "%s: Rig busy - retrying: '%s'\n", __func__,
priv->cmd_str); priv->cmd_str);
rc = -RIG_BUSBUSY; /* retry */ rc = -RIG_ERJCTED; /* retry */
break; break;
} }