kopia lustrzana https://github.com/Hamlib/Hamlib
Porównaj commity
5 Commity
59e4ba1cdc
...
8d33869ca2
Autor | SHA1 | Data |
---|---|---|
Mike Black W9MDB | 8d33869ca2 | |
Mike Black W9MDB | a8cfff8bd3 | |
Mike Black W9MDB | 916049b0a5 | |
Mike Black W9MDB | 6844722faa | |
Mike Black W9MDB | f5d6be3b3e |
|
@ -39,7 +39,7 @@ BUILT_SOURCES += hamlibperl_wrap.c
|
|||
MOSTLYCLEANFILES += hamlibperl_wrap.c Hamlib.pm Hamlib.bs Hamlib-pl.mk.old
|
||||
example_DATA += perltest.pl
|
||||
|
||||
hamlibperl_wrap.c: hamlib.swg $(SWIGDEP) ignore.swg
|
||||
hamlibperl_wrap.c: hamlib.swg $(SWIGDEP) ignore.swg rig.swg
|
||||
$(AM_V_GEN)$(SWIG) -perl5 -shadow $(AM_CPPFLAGS) -I$(top_srcdir)/bindings \
|
||||
-o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ AC_SUBST([ABI_AGE])
|
|||
AM_CPPFLAGS="${AM_CPPFLAGS} -DIN_HAMLIB"
|
||||
|
||||
# Add Hamlib header include paths
|
||||
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib -I\$(top_builddir)/include -I\$(top_srcdir)/include/hamlib"
|
||||
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib -I\$(top_builddir)/include -I\$(top_srcdir)/include/hamlib -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
|
||||
## --------------- ##
|
||||
|
|
|
@ -437,7 +437,9 @@ struct icom_addr
|
|||
#define TOK_MODE731 TOKEN_BACKEND(2)
|
||||
#define TOK_NOXCHG TOKEN_BACKEND(3)
|
||||
#define TOK_TONE_ENABLE TOKEN_BACKEND(4)
|
||||
#define TOK_FILTERNUM TOKEN_BACKEND(5)
|
||||
#define TOK_FILTER_USBD TOKEN_BACKEND(5)
|
||||
#define TOK_FILTER_USB TOKEN_BACKEND(6)
|
||||
#define TOK_FILTER_CW TOKEN_BACKEND(7)
|
||||
|
||||
const struct confparams icom_cfg_params[] =
|
||||
{
|
||||
|
@ -461,7 +463,15 @@ const struct confparams icom_cfg_params[] =
|
|||
"0", RIG_CONF_CHECKBUTTON
|
||||
},
|
||||
{
|
||||
TOK_FILTERNUM, "filternum", "Filter to use", "Filter to use when setting mode",
|
||||
TOK_FILTER_USBD, "filter_usbd", "Filter to use USBD", "Filter to use for USBD/LSBD when setting mode",
|
||||
"0", RIG_CONF_NUMERIC, {.n = {0, 3, 1}}
|
||||
},
|
||||
{
|
||||
TOK_FILTER_USB, "filter_usb", "Filter to use USB", "Filter to use when for USB/LSB setting mode",
|
||||
"0", RIG_CONF_NUMERIC, {.n = {0, 3, 1}}
|
||||
},
|
||||
{
|
||||
TOK_FILTER_CW, "filter_cw", "Filter to use CW", "Filter to use for CW/CWR when setting mode",
|
||||
"0", RIG_CONF_NUMERIC, {.n = {0, 3, 1}}
|
||||
},
|
||||
{RIG_CONF_END, NULL,}
|
||||
|
@ -2256,7 +2266,8 @@ static int icom_get_mode_x26(RIG *rig, vfo_t vfo, int *mode_len,
|
|||
return RIG_OK;
|
||||
}
|
||||
|
||||
static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, int datamode,
|
||||
static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode,
|
||||
rmode_t icom_mode, int datamode,
|
||||
int filter)
|
||||
{
|
||||
struct icom_priv_data *priv = rig->state.priv;
|
||||
|
@ -2274,13 +2285,32 @@ static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, int datamode,
|
|||
}
|
||||
|
||||
icom_get_mode_x26(rig, vfo, &mode_len, mode_buf);
|
||||
buf[0] = mode;
|
||||
buf[0] = icom_mode;
|
||||
buf[1] = datamode;
|
||||
// Skip filter selection, because at least IC-7300 has a bug defaulting to filter 2 when changing mode
|
||||
// Tested on IC-7300 and IC-9700
|
||||
buf[2] = priv->filter;
|
||||
if (priv->filternum > 0) buf[2] = priv->filternum; // override with requested filternum
|
||||
// buf[2] = 1;
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: mode=%ld, filters usbd=%d, usb=%d, cw=%d\n",
|
||||
__func__, mode, priv->filter_usbd, priv->filter_usb, priv->filter_cw);
|
||||
|
||||
if (priv->filter_usbd > 0 && (mode == RIG_MODE_PKTUSB
|
||||
|| mode == RIG_MODE_PKTLSB))
|
||||
{
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: filter usbd=%d\n", __func__, priv->filter_usbd);
|
||||
buf[2] = priv->filter_usbd;
|
||||
}
|
||||
|
||||
if (priv->filter_usb > 0 && (mode == RIG_MODE_USB || mode == RIG_MODE_LSB))
|
||||
{
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: filter usb=%d\n", __func__, priv->filter_usb);
|
||||
buf[2] = priv->filter_usb;
|
||||
}
|
||||
|
||||
if (priv->filter_cw > 0 && (mode == RIG_MODE_CW || mode == RIG_MODE_CWR))
|
||||
{
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: filter cw=%d\n", __func__, priv->filter_cw);
|
||||
buf[2] = priv->filter_cw;
|
||||
}
|
||||
|
||||
int vfo_number = icom_get_vfo_number_x25x26(rig, vfo);
|
||||
|
||||
|
@ -2457,7 +2487,7 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
}
|
||||
else
|
||||
{
|
||||
retval = icom_set_mode_x26(rig, vfo, mode_icom, datamode[0], datamode[1]);
|
||||
retval = icom_set_mode_x26(rig, vfo, mode, mode_icom, datamode[0], datamode[1]);
|
||||
}
|
||||
|
||||
if (retval != RIG_OK)
|
||||
|
@ -2490,7 +2520,8 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
|||
}
|
||||
}
|
||||
|
||||
if ((width != RIG_PASSBAND_NOCHANGE) && (width != current_width))
|
||||
if (((width != RIG_PASSBAND_NOCHANGE) && (width != current_width))
|
||||
|| (priv->filter_usbd > 0 || priv->filter_usb > 0 || priv->filter_cw > 0))
|
||||
{
|
||||
icom_set_dsp_flt(rig, mode, width);
|
||||
}
|
||||
|
@ -5020,10 +5051,31 @@ int icom_set_conf(RIG *rig, hamlib_token_t token, const char *val)
|
|||
priv->tone_enable = atoi(val) ? 1 : 0;
|
||||
break;
|
||||
|
||||
case TOK_FILTERNUM:
|
||||
priv->filternum = atoi(val);
|
||||
if (priv->filternum > 3) priv->filternum = 3;
|
||||
if (priv->filternum < 1) priv->filternum = 1;
|
||||
case TOK_FILTER_USBD:
|
||||
priv->filter_usbd = atoi(val);
|
||||
|
||||
if (priv->filter_usbd > 3) { priv->filter_usbd = 3; }
|
||||
|
||||
if (priv->filter_usbd < 1) { priv->filter_usbd = 1; }
|
||||
|
||||
break;
|
||||
|
||||
case TOK_FILTER_USB:
|
||||
priv->filter_usb = atoi(val);
|
||||
|
||||
if (priv->filter_usb > 3) { priv->filter_usb = 3; }
|
||||
|
||||
if (priv->filter_usb < 1) { priv->filter_usb = 1; }
|
||||
|
||||
break;
|
||||
|
||||
case TOK_FILTER_CW:
|
||||
priv->filter_cw = atoi(val);
|
||||
|
||||
if (priv->filter_cw > 3) { priv->filter_cw = 3; }
|
||||
|
||||
if (priv->filter_cw < 1) { priv->filter_cw = 1; }
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#define BACKEND_VER "20240204"
|
||||
#define BACKEND_VER "20240211"
|
||||
|
||||
#define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31)
|
||||
#define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)
|
||||
|
@ -293,7 +293,9 @@ struct icom_priv_data
|
|||
int vfo_flag; // used to skip vfo check when frequencies are equal
|
||||
int dual_watch_main_sub; // 0=main, 1=sub
|
||||
int tone_enable; /*!< Re-enable tone after freq change -- IC-705 bug with gpredict */
|
||||
int filternum; /*!< Filter number to use when setting mode */
|
||||
int filter_usbd; /*!< Filter number to use for USBD/LSBD when setting mode */
|
||||
int filter_usb; /*!< Filter number to use for USB/LSB when setting mode */
|
||||
int filter_cw; /*!< Filter number to use for CW/CWR when setting mode */
|
||||
};
|
||||
|
||||
extern const struct ts_sc_list r8500_ts_sc_list[];
|
||||
|
|
|
@ -3049,8 +3049,12 @@ int rig_test_2038(RIG *rig)
|
|||
{
|
||||
time_t x;
|
||||
|
||||
#if defined(_TIME_BITS)
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: enter _TIME_BITS=64 testing enabled\n", __func__);
|
||||
#if defined(_TIME_BITS)
|
||||
#if defined(__GLIBC_MINOR__)
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: enter _TIME_BITS=%d, __TIMESIZE=%d testing enabled for GLIBC %d.%d\n", __func__, _TIME_BITS, __TIMESIZE, __GLIBC__, __GLIBC_MINOR__);
|
||||
#else
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: enter _TIME_BITS=64 testing enabled for unknown libc\n", __func__);
|
||||
#endif
|
||||
#else
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: enter _TIME_BITS=64 testing not enabled\n", __func__);
|
||||
#endif
|
||||
|
|
|
@ -67,7 +67,7 @@ static libusb_device_handle *find_and_open_device(const hamlib_port_t *port)
|
|||
char string[256];
|
||||
int i, r;
|
||||
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s called LIBUSB_API_VERSION=%x\n", __func__, LIBUSB_API_VERSION);
|
||||
|
||||
rig_debug(RIG_DEBUG_VERBOSE,
|
||||
"%s: looking for device %04x:%04x...",
|
||||
|
|
Ładowanie…
Reference in New Issue