[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. d425c8af709994248f0eb
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: Michael B. <mdb...@us...> - 2020-12-30 23:44:14
|
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, master has been updated via d425c8af709994248f0eb5d85bbcbcd9c16bf66c (commit) via 31dedcf4f79d8fc5fcf287360e5d017842c8e4c0 (commit) via dbb06f9e7ba96d2f74d5adaba54b5718b5271f3f (commit) from 98d9b535efa66d06463f4ee2c061e6075b80a45e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d425c8af709994248f0eb5d85bbcbcd9c16bf66c Author: Michael Black W9MDB <mdb...@ya...> Date: Wed Dec 30 17:41:31 2020 -0600 Fix cygwin compile warning diff --git a/rigs/kenwood/flex.c b/rigs/kenwood/flex.c index d64bf6fa..75f3c8c1 100644 --- a/rigs/kenwood/flex.c +++ b/rigs/kenwood/flex.c @@ -70,36 +70,36 @@ int verify_flexradio_id(RIG *rig, char *id) if (strcmp("900", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (PowerSDR compatible)\n", + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (PowerSDR compatible)\n", __func__, id); } else if (strcmp("904", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6700)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6700)\n", __func__, id); } else if (strcmp("905", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6500)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6500)\n", __func__, id); } else if (strcmp("906", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6500R)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6500R)\n", __func__, id); } else if (strcmp("907", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6300)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6300)\n", __func__, id); } else if (strcmp("908", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6400)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6400)\n", __func__, id); } else if (strcmp("909", idptr) == 0) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (Flex 6600)\n", __func__, id); + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.5s (Flex 6600)\n", __func__, id); } else { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%s) is not a Flex 6000 Series\n", + rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%.5s) is not a Flex 6000 Series\n", __func__, id); return -RIG_EPROTO; } commit 31dedcf4f79d8fc5fcf287360e5d017842c8e4c0 Author: Michael Black W9MDB <mdb...@ya...> Date: Wed Dec 30 08:06:02 2020 -0600 Allow rig_load_all_backends to be called more than once diff --git a/src/register.c b/src/register.c index 659b91fa..e9ea57d4 100644 --- a/src/register.c +++ b/src/register.c @@ -454,6 +454,8 @@ int rig_load_all_backends() { int i; + memset(rig_hash_table, 0 , sizeof(rig_hash_table)); + for (i = 0; i < RIG_BACKEND_MAX && rig_backend_list[i].be_name; i++) { rig_load_backend(rig_backend_list[i].be_name); commit dbb06f9e7ba96d2f74d5adaba54b5718b5271f3f Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Dec 29 16:15:54 2020 -0600 Add debug to show vfos in vfo_list https://github.com/Hamlib/Hamlib/issues/482 diff --git a/src/rig.c b/src/rig.c index fc5034b2..8aff645e 100644 --- a/src/rig.c +++ b/src/rig.c @@ -475,6 +475,16 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) rs->vfo_list |= caps->tx_range_list2[i].vfo; rs->mode_list |= caps->tx_range_list2[i].modes; } + if (rs->vfo_list & RIG_VFO_A) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_A\n", __func__); + if (rs->vfo_list & RIG_VFO_B) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_B\n", __func__); + if (rs->vfo_list & RIG_VFO_C) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_C\n", __func__); + if (rs->vfo_list & RIG_VFO_SUB_A) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_SUB_A\n", __func__); + if (rs->vfo_list & RIG_VFO_SUB_B) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_SUB_B\n", __func__); + if (rs->vfo_list & RIG_VFO_MAIN_A) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_MAIN_A\n", __func__); + if (rs->vfo_list & RIG_VFO_MAIN_B) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_MAIN_B\n", __func__); + if (rs->vfo_list & RIG_VFO_SUB) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_SUB\n", __func__); + if (rs->vfo_list & RIG_VFO_MAIN) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_MAIN\n", __func__); + if (rs->vfo_list & RIG_VFO_MEM) rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_MEM\n", __func__); memcpy(rs->preamp, caps->preamp, sizeof(int)*MAXDBLSTSIZ); memcpy(rs->attenuator, caps->attenuator, sizeof(int)*MAXDBLSTSIZ); ----------------------------------------------------------------------- Summary of changes: rigs/kenwood/flex.c | 16 ++++++++-------- src/register.c | 2 ++ src/rig.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |