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

Fix Elecraft K3 BW$ length read warning 

https://github.com/Hamlib/Hamlib/issues/825
pull/846/head
Mike Black W9MDB 2021-10-19 06:46:25 -05:00
rodzic a15726e652
commit 6b6156c416
1 zmienionych plików z 4 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -945,6 +945,7 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
pbwidth_t temp_w; pbwidth_t temp_w;
char *cmd_mode = "DT"; char *cmd_mode = "DT";
char *cmd_bw = "BW"; char *cmd_bw = "BW";
int cmd_bw_len = 6;
struct kenwood_priv_data *priv = rig->state.priv; struct kenwood_priv_data *priv = rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo)); rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo));
@ -953,6 +954,7 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
cmd_mode = "DT$"; cmd_mode = "DT$";
cmd_bw = "BW$"; cmd_bw = "BW$";
cmd_bw_len = 7;
} }
if (!mode || !width) if (!mode || !width)
@ -1035,7 +1037,7 @@ 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
*/ */
err = kenwood_safe_transaction(rig, cmd_bw, buf, KENWOOD_MAX_BUF_LEN, 6); err = kenwood_safe_transaction(rig, cmd_bw, buf, KENWOOD_MAX_BUF_LEN, cmd_bw_len);
if (err != RIG_OK) if (err != RIG_OK)
{ {
@ -1043,14 +1045,7 @@ 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[cmd_bw_len-4]) * 10;
{
*width = atoi(&buf[3]) * 10;
}
else
{
*width = atoi(&buf[2]) * 10;
}
return RIG_OK; return RIG_OK;
} }