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

Do not expect a reply from GS-232B stop command. Fix GS-232B retry error code.

pull/457/head
Mikael Nousiainen 2020-12-06 14:21:39 +02:00
rodzic 5be6a06e9a
commit b062ddce22
1 zmienionych plików z 5 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
rotators/gs232a/gs232b.c
Wyświetl plik

@ -106,13 +106,12 @@ transaction_write:
retval = read_string(&rs->rotport, data, data_len, REPLY_EOM, retval = read_string(&rs->rotport, data, data_len, REPLY_EOM,
strlen(REPLY_EOM)); strlen(REPLY_EOM));
if (strncmp(data, "\r\n", 2) == 0 if (strncmp(data, "\r\n", 2) == 0 || strchr(data, '>'))
|| strchr(data, '>'))
{ {
rig_debug(RIG_DEBUG_ERR, "%s: wrong response nbytes=%d\n", __func__, rig_debug(RIG_DEBUG_ERR, "%s: Invalid response for '%s': '%s' (length=%d)\n",
(int)strlen(data)); __func__, cmdstr, data, (int) strlen(data));
dump_hex((unsigned char *)data, strlen(data)); dump_hex((unsigned char *)data, strlen(data));
retval = -1; // force retry retval = -RIG_EPROTO; // force retry
} }
@ -253,13 +252,12 @@ gs232b_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
static int static int
gs232b_rot_stop(ROT *rot) gs232b_rot_stop(ROT *rot)
{ {
char buf[32];
int retval; int retval;
rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
/* All Stop */ /* All Stop */
retval = gs232b_transaction(rot, "S" EOM, buf, sizeof(buf), 0); retval = gs232b_transaction(rot, "S" EOM, NULL, 0, 0);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {