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

Fix out of sequence merge for issue #1634 

Still undetermined if fix is needed for TS-590SG
pull/1749/head
George Baltz N3GB 2025-05-17 14:22:09 -04:00
rodzic 9fdf8f201c
commit a4b6ef4fd7
2 zmienionych plików z 12 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -231,7 +231,7 @@ struct confparams kenwood_cfg_params[] =
{ RIG_CONF_END, NULL, } { RIG_CONF_END, NULL, }
}; };
int remove_nonprint(char *s) static int remove_nonprint(char *s)
{ {
int i, j = 0; int i, j = 0;
if (s == NULL) return 0; if (s == NULL) return 0;
@ -392,7 +392,7 @@ transaction_write:
skip |= strncmp(cmdstr, "RD", 2) == 0; skip |= strncmp(cmdstr, "RD", 2) == 0;
skip |= strncmp(cmdstr, "KYW", 3) == 0; skip |= strncmp(cmdstr, "KYW", 3) == 0;
skip |= strncmp(cmdstr, "KY ", 3) == 0; skip |= strncmp(cmdstr, "KY ", 3) == 0;
skip |= strncmp(cmdstr, "KY0", 3) == 0; skip |= strncmp(cmdstr, "KY0", 3) == 0;
skip |= strncmp(cmdstr, "KY2", 3) == 0; skip |= strncmp(cmdstr, "KY2", 3) == 0;
skip |= strncmp(cmdstr, "PS1", 3) == 0; skip |= strncmp(cmdstr, "PS1", 3) == 0;
skip |= strncmp(cmdstr, "PS0", 3) == 0; skip |= strncmp(cmdstr, "PS0", 3) == 0;
@ -770,7 +770,7 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
if (checklen && length != expected) /* worth retrying as some rigs if (checklen && length != expected) /* worth retrying as some rigs
occasionally send short results */ occasionally send short results */
{ {
// QRPLABS can't seem top decide if they give 37 or 38 bytes for IF command // QRPLABS can't seem to decide if they give 37 or 38 bytes for IF command
if (strncmp(cmd, "IF", 2) == 0 && rig->caps->rig_model == RIG_MODEL_QRPLABS) { break; } if (strncmp(cmd, "IF", 2) == 0 && rig->caps->rig_model == RIG_MODEL_QRPLABS) { break; }
struct kenwood_priv_data *priv = STATE(rig)->priv; struct kenwood_priv_data *priv = STATE(rig)->priv;
@ -5575,6 +5575,14 @@ int kenwood_send_morse(RIG *rig, vfo_t vfo, const char *msg)
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %s", m2); SNPRINTF(morsebuf, sizeof(morsebuf), "KY %s", m2);
break; break;
case RIG_MODEL_TS590S:
//??case RIG_MODEL_TS590SG:
/* The command must consist of 28 bytes right aligned.
* See https://github.com/Hamlib/Hamlib/issues/1634
*/
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %24s", m2);
break;
case RIG_MODEL_TS890S: case RIG_MODEL_TS890S:
SNPRINTF(morsebuf, sizeof morsebuf, "KY2%s", m2); SNPRINTF(morsebuf, sizeof morsebuf, "KY2%s", m2);
break; break;
@ -5589,11 +5597,6 @@ int kenwood_send_morse(RIG *rig, vfo_t vfo, const char *msg)
} }
/* FALL THROUGH */ /* FALL THROUGH */
case RIG_MODEL_TS590S:
/* the command must consist of 28 bytes right aligned */
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %24s", m2);
break;
default: default:
/* the command must consist of 28 bytes 0x20 padded */ /* the command must consist of 28 bytes 0x20 padded */
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %-24s", m2); SNPRINTF(morsebuf, sizeof(morsebuf), "KY %-24s", m2);

2
rigs/kenwood/kenwood.h
Wyświetl plik

@ -28,7 +28,7 @@
#include "token.h" #include "token.h"
#include "idx_builtin.h" #include "idx_builtin.h"
#define BACKEND_VER "20250107" #define BACKEND_VER "20250515"
#define EOM_KEN ';' #define EOM_KEN ';'
#define EOM_TH '\r' #define EOM_TH '\r'