diff --git a/hamlib/config.h b/hamlib/config.h index 17c3e06..a80249f 100644 --- a/hamlib/config.h +++ b/hamlib/config.h @@ -165,6 +165,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_NETINET_IN_H */ +/* Define if parallel devices are to be built */ +#define HAVE_PARALLEL 1 + /* Define to 1 if you have the `pow' function. */ #define HAVE_POW 1 @@ -364,7 +367,7 @@ #define PACKAGE_NAME "Hamlib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Hamlib 4.5.1" +#define PACKAGE_STRING "Hamlib 4.5.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "hamlib" @@ -373,7 +376,7 @@ #define PACKAGE_URL "http://www.hamlib.org" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.5.1" +#define PACKAGE_VERSION "4.5.4" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -413,7 +416,7 @@ /* Version number of package */ -#define VERSION "4.5.1" +#define VERSION "4.5.4" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/hamlib/libhamlib-4.dll b/hamlib/libhamlib-4.dll index f8fc02b..8a2afc2 100644 Binary files a/hamlib/libhamlib-4.dll and b/hamlib/libhamlib-4.dll differ diff --git a/hamlib/libhamlib.dll.a b/hamlib/libhamlib.dll.a index 5d762f3..7ad64d0 100644 Binary files a/hamlib/libhamlib.dll.a and b/hamlib/libhamlib.dll.a differ diff --git a/hamlib/rig.h b/hamlib/rig.h index 08ecb8b..5d59e2e 100644 --- a/hamlib/rig.h +++ b/hamlib/rig.h @@ -333,7 +333,7 @@ typedef enum { */ /* TODO: kill me, and replace by real AGC delay */ enum agc_level_e { - RIG_AGC_OFF = 0, + RIG_AGC_OFF = 0, RIG_AGC_SUPERFAST, RIG_AGC_FAST, RIG_AGC_SLOW, @@ -341,7 +341,8 @@ enum agc_level_e { RIG_AGC_MEDIUM, RIG_AGC_AUTO, RIG_AGC_LONG, - RIG_AGC_ON /*< Turns AGC ON -- Kenwood -- restores last level set */ + RIG_AGC_ON, /*< Turns AGC ON -- Kenwood -- restores last level set */ + RIG_AGC_NONE /*< Rig does not have CAT AGC control */ }; @@ -3396,6 +3397,7 @@ extern HAMLIB_EXPORT(int) rig_set_vfo_opt(RIG *rig, int status); extern HAMLIB_EXPORT(int) rig_get_vfo_info(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode, pbwidth_t *width, split_t *split, int *satmode); extern HAMLIB_EXPORT(int) rig_get_rig_info(RIG *rig, char *response, int max_response_len); extern HAMLIB_EXPORT(int) rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int * cache_ms_freq, rmode_t *mode, int *cache_ms_mode, pbwidth_t *width, int *cache_ms_width); +extern HAMLIB_EXPORT(int) rig_get_cache_freq(RIG *rig, vfo_t vfo, freq_t *freq, int * cache_ms_freq); extern HAMLIB_EXPORT(int) rig_set_clock(RIG *rig, int year, int month, int day, int hour, int min, int sec, double msec, int utc_offset); extern HAMLIB_EXPORT(int) rig_get_clock(RIG *rig, int *year, int *month, int *day, int *hour, int *min, int *sec, double *msec, int *utc_offset); @@ -3426,6 +3428,8 @@ extern HAMLIB_EXPORT(char*) rig_make_md5(char *pass); extern HAMLIB_EXPORT(int) rig_set_lock_mode(RIG *rig, int lock); extern HAMLIB_EXPORT(int) rig_get_lock_mode(RIG *rig, int *lock); +extern HAMLIB_EXPORT(int) rig_is_model(RIG *rig, rig_model_t model); + //! @endcond diff --git a/hamlib/riglist.h b/hamlib/riglist.h index be21679..3c347da 100644 --- a/hamlib/riglist.h +++ b/hamlib/riglist.h @@ -185,6 +185,7 @@ #define RIG_MODEL_MALACHITE RIG_MAKE_MODEL(RIG_KENWOOD, 49) #define RIG_MODEL_LAB599_TX500 RIG_MAKE_MODEL(RIG_KENWOOD,50) #define RIG_MODEL_SDRUNO RIG_MAKE_MODEL(RIG_KENWOOD,51) +#define RIG_MODEL_QRPLABS RIG_MAKE_MODEL(RIG_KENWOOD,52) /* * Icom diff --git a/hamlib/rotlist.h b/hamlib/rotlist.h index b95f86f..a96b9a5 100644 --- a/hamlib/rotlist.h +++ b/hamlib/rotlist.h @@ -557,6 +557,7 @@ #define ROT_MODEL_PROSISTEL_D_AZ ROT_MAKE_MODEL(ROT_PROSISTEL, 1) #define ROT_MODEL_PROSISTEL_D_EL ROT_MAKE_MODEL(ROT_PROSISTEL, 2) #define ROT_MODEL_PROSISTEL_COMBI_TRACK_AZEL ROT_MAKE_MODEL(ROT_PROSISTEL, 3) +#define ROT_MODEL_PROSISTEL_D_EL_CBOXAZ ROT_MAKE_MODEL(ROT_PROSISTEL, 4) /**