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

Another attempt at elecraft_get_vfo_tq 

https://github.com/Hamlib/Hamlib/issues/863
pull/875/head
Mike Black W9MDB 2021-11-09 17:48:34 -06:00
rodzic 353bee3a5f
commit 5102d3e721
1 zmienionych plików z 27 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
rigs/kenwood/elecraft.c
Wyświetl plik

@ -476,10 +476,12 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd,
// Works on K4 // Works on K4
int elecraft_get_vfo_tq(RIG *rig, vfo_t *vfo) int elecraft_get_vfo_tq(RIG *rig, vfo_t *vfo)
{ {
int retval; int retval,err;
int fr,ft,tx; int fr,ft,tx;
char cmdbuf[10]; char cmdbuf[10];
char splitbuf[12]; char splitbuf[12];
struct rig_state *rs = &rig->state;
snprintf(cmdbuf,sizeof(cmdbuf),"FR;FT;TQ;"); snprintf(cmdbuf,sizeof(cmdbuf),"FR;FT;TQ;");
memset(splitbuf,0,sizeof(splitbuf)); memset(splitbuf,0,sizeof(splitbuf));
retval = kenwood_safe_transaction(rig, cmdbuf, splitbuf, 12, 12); retval = kenwood_safe_transaction(rig, cmdbuf, splitbuf, 12, 12);
@ -489,12 +491,32 @@ int elecraft_get_vfo_tq(RIG *rig, vfo_t *vfo)
RETURNFUNC(retval); RETURNFUNC(retval);
} }
if(sscanf(splitbuf, "FT%1d;FT%1d;TQ%1d", &fr, &ft, &tx) == 3) err = read_string(&rs->rigport, splitbuf, sizeof(splitbuf), ";", 1, 0);
if (err != RIG_OK)
{ {
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_EPROTO);
} }
else { if(sscanf(splitbuf, "FR%1d", &fr) != 1)
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse '%s'\n", __func__, splitbuf); {
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse FR '%s'\n", __func__, splitbuf);
}
err = read_string(&rs->rigport, splitbuf, sizeof(splitbuf), ";", 1, 0);
if (err != RIG_OK)
{
RETURNFUNC(RIG_EPROTO);
}
if(sscanf(splitbuf, "FT%1d", &ft) != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse FT '%s'\n", __func__, splitbuf);
}
err = read_string(&rs->rigport, splitbuf, sizeof(splitbuf), ";", 1, 0);
if (err != RIG_OK)
{
RETURNFUNC(RIG_EPROTO);
}
if(sscanf(splitbuf, "TQ%1d", &tx) != 1)
{
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse TX '%s'\n", __func__, splitbuf);
} }
if (tx) *vfo = ft; if (tx) *vfo = ft;
else *vfo = fr; else *vfo = fr;