k3.c clip bandwidth to 99999

k3.c fix set_mode for VFOB
k3.c remove passband limit checks and just let the rig do it's thing
https://github.com/Hamlib/Hamlib/issues/563
pull/574/head
Michael Black W9MDB 2021-03-01 16:47:47 -06:00
rodzic 10fbe9bd4a
commit 2e56014426
1 zmienionych plików z 12 dodań i 2 usunięć

Wyświetl plik

@ -1080,6 +1080,11 @@ int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (vfo == RIG_VFO_CURR)
{
vfo = rig->state.current_vfo;
}
switch (mode) switch (mode)
{ {
case RIG_MODE_PKTLSB: case RIG_MODE_PKTLSB:
@ -1151,8 +1156,8 @@ int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/ */
/* passband widths vary by mode so gather lower and upper limits */ /* passband widths vary by mode so gather lower and upper limits */
pbwidth_t pb_nar = rig_passband_narrow(rig, mode); //pbwidth_t pb_nar = rig_passband_narrow(rig, mode);
pbwidth_t pb_wid = rig_passband_wide(rig, mode); //pbwidth_t pb_wid = rig_passband_wide(rig, mode);
if (width < 0) if (width < 0)
{ {
@ -1163,6 +1168,7 @@ int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
width = rig_passband_normal(rig, mode); width = rig_passband_normal(rig, mode);
} }
#if 0
else if (width < pb_nar) else if (width < pb_nar)
{ {
width = pb_nar; width = pb_nar;
@ -1171,6 +1177,10 @@ int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
width = pb_wid; width = pb_wid;
} }
#endif
// width is 50Hz rounded down
width += 50;
if (width > 99999) width = 99999;
if (vfo == RIG_VFO_B) if (vfo == RIG_VFO_B)
{ {