[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.5.5 created. 4.5.4-8-gdc1d9c
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: n0nb <n0...@us...> - 2023-01-18 12:58:18
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, Hamlib-4.5.5 has been created at dc1d9cf43ef330e8ea518e5bea99c1f83a63147c (commit) - Log ----------------------------------------------------------------- commit dc1d9cf43ef330e8ea518e5bea99c1f83a63147c Author: Mike Black W9MDB <mdb...@ya...> Date: Tue Jan 17 23:54:05 2023 -0600 Fix AGC level display in rigctld https://github.com/Hamlib/Hamlib/issues/1155 diff --git a/NEWS b/NEWS index 23de5250..a1b4ac1c 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Version 4.6 * Fix FTDX3000 rig split Version 4.5.5 + * Fix AGC level display in rigctld * Change FTDX10 to no serial handshake * Add TS2000 to has_ps exception * Add FT991 to 60M exception diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index c0ce157a..ad90419e 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -815,7 +815,7 @@ static int netrigctl_open(RIG *rig) int i = 0; char *p = strtok(value, " "); rig->caps->agc_levels[0] = RIG_AGC_NONE; // default value gets overwritten - rig->caps->agc_level_count = 1; + rig->caps->agc_level_count = 0; while (p) { @@ -2736,7 +2736,7 @@ struct rig_caps netrigctl_caps = RIG_MODEL(RIG_MODEL_NETRIGCTL), .model_name = "NET rigctl", .mfg_name = "Hamlib", - .version = "20230106.0", + .version = "20230117.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_OTHER, diff --git a/src/sprintflst.c b/src/sprintflst.c index 07e3c347..6a6c870f 100644 --- a/src/sprintflst.c +++ b/src/sprintflst.c @@ -939,7 +939,7 @@ int rig_sprintf_agc_levels(RIG *rig, char *str, int lenstr) { if (strlen(str) > 0) { strcat(str, " "); } - sprintf(tmpbuf, "%d=%s", i, + sprintf(tmpbuf, "%d=%s", rig->caps->agc_levels[i], rig_stragclevel(rig->caps->agc_levels[i])); if (strlen(str) + strlen(tmpbuf) < lenstr - 1) commit 8d20fa079f77329105a8d97d96d9cf5cd0cb59fb Author: Mike Black W9MDB <mdb...@ya...> Date: Tue Jan 17 22:31:17 2023 -0600 Update NEWS diff --git a/NEWS b/NEWS index 536a8033..23de5250 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Version 4.6 * Fix FTDX3000 rig split Version 4.5.5 + * Change FTDX10 to no serial handshake * Add TS2000 to has_ps exception * Add FT991 to 60M exception * Fix get_powerstat bad call in rigctl_parse.c commit f5dc6edc160d925c2fc5d06f4f7f78d64b32a236 Author: Mike Black W9MDB <mdb...@ya...> Date: Tue Jan 17 22:30:02 2023 -0600 Change FTDX10 handshake to None instead of Hardware diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c index 9daf5241..77101d8a 100644 --- a/rigs/yaesu/ftdx10.c +++ b/rigs/yaesu/ftdx10.c @@ -137,7 +137,7 @@ const struct rig_caps ftdx10_caps = RIG_MODEL(RIG_MODEL_FTDX10), .model_name = "FTDX-10", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".5", + .version = NEWCAT_VER ".6", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -149,7 +149,7 @@ const struct rig_caps ftdx10_caps = .serial_data_bits = 8, .serial_stop_bits = 2, .serial_parity = RIG_PARITY_NONE, - .serial_handshake = RIG_HANDSHAKE_HARDWARE, + .serial_handshake = RIG_HANDSHAKE_NONE, .write_delay = FTDX10_WRITE_DELAY, .post_write_delay = FTDX10_POST_WRITE_DELAY, .timeout = 2000, commit a03d5892255a3c2987e144b474d3edadba4209fa Author: Mike Black W9MDB <mdb...@ya...> Date: Sun Jan 15 12:41:01 2023 -0600 Add TS-2000 to has_ps exceptions https://github.com/Hamlib/Hamlib/issues/1213 diff --git a/NEWS b/NEWS index 9a533279..536a8033 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Version 4.6 * Fix FTDX3000 rig split Version 4.5.5 + * Add TS2000 to has_ps exception * Add FT991 to 60M exception * Fix get_powerstat bad call in rigctl_parse.c * Really fix CM108 ptt_bitnum usage diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index fe41cdbf..1abad7a1 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -771,6 +771,7 @@ int kenwood_init(RIG *rig) if (rig->caps->rig_model == RIG_MODEL_TS450S || rig->caps->rig_model == RIG_MODEL_TS50 || rig->caps->rig_model == RIG_MODEL_TS140S + || rig->caps->rig_model == RIG_MODEL_TS2000 || rig->caps->rig_model == RIG_MODEL_TS440) { priv->has_ps = 0; diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 69106804..d0c077a0 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -29,7 +29,7 @@ #include "misc.h" #include "idx_builtin.h" -#define BACKEND_VER "20230109" +#define BACKEND_VER "20230115" #define EOM_KEN ';' #define EOM_TH '\r' commit d80e23c15091874efc32592f26a7c91990fcb1f2 Author: Mike Black W9MDB <mdb...@ya...> Date: Sun Jan 15 10:18:44 2023 -0600 Update NEWS diff --git a/NEWS b/NEWS index e05a2746..9a533279 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Version 4.6 * Fix FTDX3000 rig split Version 4.5.5 + * Add FT991 to 60M exception * Fix get_powerstat bad call in rigctl_parse.c * Really fix CM108 ptt_bitnum usage * Fix Elecraft power2mW precision/accuracy commit 0b886dfd0b8eef5e6309053effd9088d418b8ebe Author: Mike Black W9MDB <mdb...@ya...> Date: Sun Jan 15 10:17:54 2023 -0600 Add FT991 to 60M exception diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 703b7fb6..65f8b9f4 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -824,6 +824,9 @@ int newcat_60m_exception(RIG *rig, freq_t freq, mode_t mode) return -RIG_EINVAL; } + // some rigs need to skip freq/mode settings as 60M only operates in memory mode + if (is_ft991) { return 1; } + if (!is_ftdx10 && !is_ft710 && !is_ftdx101d && !is_ftdx101mp) { return 0; } rig_debug(RIG_DEBUG_VERBOSE, "%s: 60M exception ignoring freq/mode commands\n", diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h index 5202dcfd..db1d64c4 100644 --- a/rigs/yaesu/newcat.h +++ b/rigs/yaesu/newcat.h @@ -50,7 +50,7 @@ typedef char ncboolean; /* shared function version */ -#define NEWCAT_VER "20230109" +#define NEWCAT_VER "20230115" /* Hopefully large enough for future use, 128 chars plus '\0' */ #define NEWCAT_DATA_LEN 129 commit ae0add1e980bbe2a4ce5552a58824947157f2d56 Author: Mike Black W9MDB <mdb...@ya...> Date: Fri Jan 13 17:30:55 2023 -0600 Fix get_powerstat call when get_powerstat is not defined https://github.com/Hamlib/Hamlib/issues/1217 diff --git a/NEWS b/NEWS index 3c18ed21..e05a2746 100644 --- a/NEWS +++ b/NEWS @@ -24,8 +24,14 @@ Version 4.6 * Add FLIR PTU-D48, E46, D100, D300 rotors * Fix FTDX3000 rig split +Version 4.5.5 + * Fix get_powerstat bad call in rigctl_parse.c + * Really fix CM108 ptt_bitnum usage + * Fix Elecraft power2mW precision/accuracy + * Fix power on/off/on for Icom rigs with rigctld power_on=0 + Version 4.5.4 - * 2023-01-10 + * 2023-XX-XX * Fix CM108 ptt setting for non-default usage * Fix power on/off for Icom rigs with rigctld power_on=0 * Fix get_powerstat status return for non-PS kenwood rigs diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 1b356aac..c9c87c56 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -1728,7 +1728,7 @@ readline_repeat: else { - if (my_rig->caps->set_powerstat && (rig_powerstat == RIG_POWER_OFF + if (my_rig->caps->get_powerstat && (rig_powerstat == RIG_POWER_OFF || rig_powerstat == RIG_POWER_STANDBY)) { // Update power status commit c915e49e1bf49eca5afd9409344cf599410a77cd Author: Mike Black W9MDB <mdb...@ya...> Date: Tue Jan 10 23:08:53 2023 -0600 Fix BSD build include path https://github.com/Hamlib/Hamlib/issues/1208 diff --git a/configure.ac b/configure.ac index ff6db5d6..e5bdfc41 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ dnl Please do not use '-' in the version number, as package managers will fail, dnl however, the use of '~' should be fine as apt (others?) will treat dnl it as an earlier version than the actual release. TNX KA6MAL dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars! -AC_INIT([Hamlib],[4.5.4],[ham...@li...],[hamlib],[http://www.hamlib.org]) +AC_INIT([Hamlib],[4.5.5],[ham...@li...],[hamlib],[http://www.hamlib.org]) AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AC_CONFIG_MACRO_DIR([macros]) @@ -269,7 +269,7 @@ LT_INIT([win32-dll]) dnl The host_os variable is set by the AC_CANONICAL_HOST macro above. AS_CASE(["$host_os"], [freebsd*], [ - AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}" + AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include" AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib" AC_SUBST([AM_LDFLAGS])], ----------------------------------------------------------------------- hooks/post-receive -- Hamlib -- Ham radio control libraries |