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

Fix error in k3.c and make k3_get_vfo work with VFOB

pull/574/head
Michael Black W9MDB 2021-02-28 17:31:57 -06:00
rodzic 1f23798efe
commit a568374a7e
1 zmienionych plików z 15 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

61
rigs/kenwood/k3.c
Wyświetl plik

@ -1021,7 +1021,14 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* The K3 is not limited to specific filter widths so we can query /* The K3 is not limited to specific filter widths so we can query
* the actual bandwidth using the BW command * the actual bandwidth using the BW command
*/ */
if (vfo == RIG_VFO_B)
{
err = kenwood_safe_transaction(rig, "BW$", buf, KENWOOD_MAX_BUF_LEN, 7);
}
else
{
err = kenwood_safe_transaction(rig, "BW", buf, KENWOOD_MAX_BUF_LEN, 6); err = kenwood_safe_transaction(rig, "BW", buf, KENWOOD_MAX_BUF_LEN, 6);
}
if (err != RIG_OK) if (err != RIG_OK)
{ {
@ -1029,7 +1036,14 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
return err; return err;
} }
if (vfo == RIG_VFO_B)
{
*width = atoi(&buf[3]) * 10;
}
else
{
*width = atoi(&buf[2]) * 10; *width = atoi(&buf[2]) * 10;
}
return RIG_OK; return RIG_OK;
} }
@ -1165,53 +1179,6 @@ int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
return RIG_OK; return RIG_OK;
} }
int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
char *cmd = "MD";
int offset = 2;
int retval;
char buf[KENWOOD_MAX_BUF_LEN];
int kmode;
ENTERFUNC;
// get our mode
if (vfo == RIG_VFO_B)
{
cmd = "MD$";
offset = 3;
}
retval = kenwood_safe_transaction(rig, cmd, buf, KENWOOD_MAX_BUF_LEN, offset + 1);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
if (buf[offset] <= '9')
{
kmode = buf[offset] - '0';
}
else
{
kmode = buf[offset] - 'A' + 10;
}
struct kenwood_priv_caps *caps = kenwood_caps(rig);
*mode = kenwood2rmode(kmode, caps->mode_table);
// now we get the bandwidth
cmd = "BW";
retval = kenwood_safe_transaction(rig, cmd, buf, KENWOOD_MAX_BUF_LEN, 7);
if (retval != RIG_OK)
{
RETURNFUNC(retval);
}
int twidth = 0;
sscanf(buf,"BW%d",&twidth);
*width = twidth;
RETURNFUNC(RIG_OK);
}
/* Elecraft rigs don't really know about swappings vfos. /* Elecraft rigs don't really know about swappings vfos.
* We just emulate them so rigctl can work correctly. * We just emulate them so rigctl can work correctly.
*/ */