Remove debug from orion.c and slow it down a touch

pull/1570/head
Mike Black W9MDB 2024-06-21 16:58:19 -05:00
rodzic 81db5ffa58
commit 097f2bbead
2 zmienionych plików z 10 dodań i 6 usunięć

Wyświetl plik

@ -140,6 +140,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
if ((*cmd != '*') && (*cmd != '/'))
{
rig_debug(RIG_DEBUG_ERR, "%s: cmd reject 1\n", __func__);
MUTEX_UNLOCK(mutex);
return -RIG_ERJCTED;
}
@ -151,8 +152,10 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
ft1 = tt565_timenow();
#endif
*data_len = data_len_init; /* restore orig. buffer length */
*data_len = read_string(rp, (unsigned char *) data, *data_len,
read_string(rp, (unsigned char *) data, *data_len,
EOM, strlen(EOM), 0, 1);
*data_len = strlen(data);
rig_debug(RIG_DEBUG_ERR, "%s: data_len = %d\n", __func__, *data_len);
if (!strncmp(data, "Z!", 2)) // command unrecognized??
{
@ -182,7 +185,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
}
else // Yes, it was a 'read', phew!
{
if (!strncmp(data + 1, cmd + 1, cmd_len - 2)) //response matches cmd?
if (strncmp(data + 1, cmd + 1, cmd_len - 2)==0) //response matches cmd?
{
MUTEX_UNLOCK(mutex);
return RIG_OK; // all is well, normal exit
@ -280,8 +283,8 @@ static void *read_device(void *p)
while (priv->threadrun)
{
tt565_get_freq(rig, RIG_VFO_A, &priv->freqA);
tt565_get_freq(rig, RIG_VFO_B, &priv->freqB);
tt565_get_mode(rig, RIG_VFO_A, &priv->mode, &priv->width);
tt565_get_freq(rig, RIG_VFO_B, &priv->freqB);
tt565_get_split_vfo(rig, RIG_VFO_A, &priv->tx_vfo, &priv->split);
hl_usleep(100 * 1000);
}
@ -802,10 +805,11 @@ int tt565_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (retval != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: tt565_transaction failed\n", __func__);
return retval;
}
if (respbuf[1] != 'R' || respbuf[3] != 'M' || resp_len <= 4)
if (respbuf[1] != 'R' || respbuf[3] != 'M' || resp_len <= 3)
{
rig_debug(RIG_DEBUG_ERR, "%s: unexpected answer '%s'\n",
__func__, respbuf);

Wyświetl plik

@ -37,7 +37,7 @@
#include "riglist.h"
#include "mutex.h"
#define BACKEND_VER "20240613"
#define BACKEND_VER "20240621"
#define TRUE 1
#define FALSE 0
@ -227,7 +227,7 @@ RIG_MODEL(RIG_MODEL_TT565),
.serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_HARDWARE,
.write_delay = 1, /* no delay between characters written */
.write_delay = 0, /* no delay between characters written */
.post_write_delay = 0, /* ms delay between writes DEBUGGING HERE */
.timeout = 200, /* ms */
.retry = 1,