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

Update some debug and fix length of PS command in kenwood.c

pull/1130/head
Mike Black W9MDB 2022-10-10 22:15:06 -05:00
rodzic 4dbce1a0aa
commit 8adfd5e351
1 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
rigs/kenwood/kenwood.c
Wyświetl plik

@ -245,7 +245,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data,
struct kenwood_priv_caps *caps = kenwood_caps(rig); struct kenwood_priv_caps *caps = kenwood_caps(rig);
struct rig_state *rs; struct rig_state *rs;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called cmd=%s datasize=%d\n", __func__, cmdstr, (int)datasize);
if ((!cmdstr && !datasize) || (datasize && !data)) if ((!cmdstr && !datasize) || (datasize && !data))
{ {
@ -373,8 +373,8 @@ transaction_read:
KENWOOD_MAX_BUF_LEN); KENWOOD_MAX_BUF_LEN);
retval = read_string(&rs->rigport, (unsigned char *) buffer, len, retval = read_string(&rs->rigport, (unsigned char *) buffer, len,
cmdtrm_str, strlen(cmdtrm_str), 0, 1); cmdtrm_str, strlen(cmdtrm_str), 0, 1);
rig_debug(RIG_DEBUG_TRACE, "%s: read_string(len=%d)='%s'\n", __func__, rig_debug(RIG_DEBUG_TRACE, "%s: read_string(expected=%d, len=%d)='%s'\n", __func__,
(int)strlen(buffer), buffer); len,(int)strlen(buffer), buffer);
if (retval < 0) if (retval < 0)
{ {
@ -637,7 +637,7 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
int err; int err;
int retry = 0; int retry = 0;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s, expected=%d\n", __func__, cmd, (int)expected);
if (!cmd) if (!cmd)
{ {
@ -1844,9 +1844,13 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
// cppcheck-suppress * // cppcheck-suppress *
SNPRINTF(freqbuf, sizeof(freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq); SNPRINTF(freqbuf, sizeof(freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq);
// we need to modify priv->verify_cmd if ID is not being used
// if FB command than we change to FB and back again to avoid VFO blinking
if (priv->verify_cmd[1]=='A' && vfo_letter == 'B') priv->verify_cmd[1]='A';
err = kenwood_transaction(rig, freqbuf, NULL, 0); err = kenwood_transaction(rig, freqbuf, NULL, 0);
if (priv->verify_cmd[1]=='B' && vfo_letter == 'B') priv->verify_cmd[1]='A';
if (RIG_OK == err && RIG_IS_TS590S if (RIG_OK == err && RIG_IS_TS590S
&& priv->fw_rev_uint <= 107 && ('A' == vfo_letter || 'B' == vfo_letter)) && priv->fw_rev_uint <= 107 && ('A' == vfo_letter || 'B' == vfo_letter))
{ {
@ -4858,7 +4862,7 @@ int kenwood_get_powerstat(RIG *rig, powerstat_t *status)
RETURNFUNC(-RIG_EINVAL); RETURNFUNC(-RIG_EINVAL);
} }
retval = kenwood_safe_transaction(rig, "PS", pwrbuf, 6, 3); retval = kenwood_safe_transaction(rig, "PS", pwrbuf, 6, 4);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {