Fix icom default filter settings

https://github.com/Hamlib/Hamlib/issues/471
pull/474/head
Michael Black W9MDB 2020-12-19 14:30:31 -06:00
rodzic 5a208a871d
commit 2b1bce89bf
4 zmienionych plików z 11 dodań i 5 usunięć

Wyświetl plik

@ -297,6 +297,10 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
{
int retval, retry;
rig_debug(RIG_DEBUG_VERBOSE,
"%s: cmd=0x%02x, subcmd=0x%02x, payload_len=%d, data_len=%d\n", __func__,
cmd, subcmd, payload_len, *data_len);
retry = rig->state.rigport.retry;
do

Wyświetl plik

@ -1631,11 +1631,11 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
if (width != RIG_PASSBAND_NOCHANGE)
{
if (filter_byte) // then we need the width byte too
unsigned char mode_icom; // not usb as it will map to USB/LSB
signed char width_icom;
rig2icom_mode(rig, vfo, mode, width, &mode_icom, &width_icom);
if (filter_byte && width_icom != -1) // then we need the width byte too
{
unsigned char mode_icom; // not used as it will map to USB/LSB
signed char width_icom;
rig2icom_mode(rig, vfo, mode, width, &mode_icom, &width_icom);
// since width_icom is 0-2 for rigs that need this here we have to make it 1-3
datamode[1] = datamode[0] ? width_icom : 0;
retval =

Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "20201216"
#define BACKEND_VER "20201219"
/*
* defines used by comp_cal_str in rig.c

Wyświetl plik

@ -1941,10 +1941,12 @@ pbwidth_t HAMLIB_API rig_passband_normal(RIG *rig, rmode_t mode)
{
if (rs->filters[i].modes & mode)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: return filter#%d, width=%d\n", __func__, i, (int)rs->filters[i].width);
return rs->filters[i].width;
}
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: filter not found...return RIG_PASSBAND_NORMAL=%d\n", __func__, (int)RIG_PASSBAND_NORMAL);
return RIG_PASSBAND_NORMAL;
}