[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. bb4eb78d22c312e708cf2
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: n0nb <n0...@us...> - 2025-01-21 09:46:39
|
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 bb4eb78d22c312e708cf21a614019970f023b5a4 (commit) via 5f43d77a813b9251da1f833d260a8e0d7ef8d7f9 (commit) via 3ccdabd9b9a3c16be5ecd2e6f40e450700b69ffc (commit) via abd6b16ff248e80585c520bd32eaf5ca8c424f15 (commit) via 130cc330a2e04d6eabff7d4dfa4de7bfe2bd95e3 (commit) via ccaec5c4dd0d693d97e056bd4d42b2b93de65ee1 (commit) via 3160921db61c9b7fe21a27c2e103e976d635beab (commit) from 198c14818a5c0f23a1dc8bd9bd577a4b4c5f2957 (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 bb4eb78d22c312e708cf21a614019970f023b5a4 Author: Michael Black W9MDB <mdb...@ya...> Date: Mon Jan 20 23:05:50 2025 -0600 Update NEWS diff --git a/NEWS b/NEWS index df5ce61f5..03f5ee844 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ Version 4.6.1 * FLRig to add DATA-U DATA-L modes * Fix TS570 RIG_LEVEL_STRENGTH with cal table * Remove get_powerstat from IC785X -- not supported + * Fix SDRConsole by removing lots of things it does not have Version 4.6 * send_raw can now take hex digits as colon-separated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd commit 5f43d77a813b9251da1f833d260a8e0d7ef8d7f9 Merge: 3ccdabd9b abd6b16ff Author: Michael Black W9MDB <mdb...@ya...> Date: Mon Jan 20 23:04:58 2025 -0600 Merge branch 'master' of github.com:Hamlib/Hamlib commit 3ccdabd9b9a3c16be5ecd2e6f40e450700b69ffc Author: Michael Black W9MDB <mdb...@ya...> Date: Mon Jan 20 23:04:24 2025 -0600 Fix SDRConsole by removing a lot of things that it does not have diff --git a/NEWS b/NEWS index 37ec46881..df5ce61f5 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,16 @@ Version 5.x -- future * rot_get_conf deprecated and replaced by rot_get_conf2 * Change FT1000MP Mark V model names to align with FT1000MP +Version 4.6.1 + * Fix C++ builds failing on rig_list_foreach function + * Fix IC9100 rigctld startup to end up on VFOA + * Fix grig build by removing sys/socket.h -- apparently not needed + * Add new QMX entry to fix incompability with QDX + * Fix IC746/PROT to not use data byte + * FLRig to add DATA-U DATA-L modes + * Fix TS570 RIG_LEVEL_STRENGTH with cal table + * Remove get_powerstat from IC785X -- not supported + Version 4.6 * send_raw can now take hex digits as colon-separated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd * Add IC7760 diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 44d3e9b04..7e24a20ef 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -39,10 +39,15 @@ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \ RIG_LEVEL_METER|RIG_LEVEL_SWR|RIG_LEVEL_COMP_METER|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) + #define TS2000_LEVEL_SET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_CWPITCH| \ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \ RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) +#define SDRCONSOLE_LEVEL_GET (|RIG_LEVEL_AGC|RIG_LEVEL_STRENGTH|RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) +#define SDRCONSOLE_LEVEL_SET (RIG_LEVEL_NONE) + + #define TS2000_FUNC_ALL (RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_NR|RIG_FUNC_NR|RIG_FUNC_BC|RIG_FUNC_BC2|RIG_FUNC_RIT|RIG_FUNC_XIT| \ RIG_FUNC_TUNER|RIG_FUNC_MON|RIG_FUNC_FBKIN|RIG_FUNC_LOCK|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_ANF) @@ -1939,7 +1944,7 @@ struct rig_caps sdrconsole_caps = RIG_MODEL(RIG_MODEL_SDRCONSOLE), .model_name = "SDRConsole", .mfg_name = "SDR Radio", - .version = BACKEND_VER ".2", + .version = BACKEND_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -2142,46 +2147,46 @@ struct rig_caps sdrconsole_caps = .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, - .set_rit = ts2000_set_rit, - .get_rit = ts2000_get_rit, - .set_xit = ts2000_set_rit, - .get_xit = ts2000_get_rit, + //.set_rit = ts2000_set_rit, + //.get_rit = ts2000_get_rit, + //.set_xit = ts2000_set_rit, + //.get_xit = ts2000_get_rit, .set_mode = kenwood_set_mode, .get_mode = kenwood_get_mode, .set_vfo = kenwood_set_vfo, .get_vfo = kenwood_get_vfo_if, .set_split_vfo = kenwood_set_split_vfo, .get_split_vfo = kenwood_get_split_vfo_if, - .set_ctcss_tone = kenwood_set_ctcss_tone_tn, - .get_ctcss_tone = kenwood_get_ctcss_tone, - .set_ctcss_sql = kenwood_set_ctcss_sql, - .get_ctcss_sql = kenwood_get_ctcss_sql, + //.set_ctcss_tone = kenwood_set_ctcss_tone_tn, + //.get_ctcss_tone = kenwood_get_ctcss_tone, + //.set_ctcss_sql = kenwood_set_ctcss_sql, + //.get_ctcss_sql = kenwood_get_ctcss_sql, .get_ptt = kenwood_get_ptt, .set_ptt = kenwood_set_ptt, - .get_dcd = kenwood_get_dcd, - .set_func = ts2000_set_func, - .get_func = ts2000_get_func, + //.get_dcd = kenwood_get_dcd, + //.set_func = ts2000_set_func, + //.get_func = ts2000_get_func, .set_level = ts2000_set_level, .get_level = ts2000_get_level, - .set_ext_func = ts2000_set_ext_func, - .get_ext_func = ts2000_get_ext_func, - .set_ext_level = ts2000_set_ext_level, - .get_ext_level = ts2000_get_ext_level, - .set_ant = kenwood_set_ant, - .get_ant = kenwood_get_ant, - .send_morse = kenwood_send_morse, - .wait_morse = rig_wait_morse, - .send_voice_mem = kenwood_send_voice_mem, - .stop_voice_mem = kenwood_stop_voice_mem, - .vfo_op = kenwood_vfo_op, - .scan = kenwood_scan, - .set_mem = kenwood_set_mem, - .get_mem = kenwood_get_mem, - .get_channel = ts2000_get_channel, - .set_channel = ts2000_set_channel, - .set_trn = kenwood_set_trn, - .get_trn = kenwood_get_trn, - .set_powerstat = kenwood_set_powerstat, + //.set_ext_func = ts2000_set_ext_func, + //.get_ext_func = ts2000_get_ext_func, + //.set_ext_level = ts2000_set_ext_level, + //.get_ext_level = ts2000_get_ext_level, + //.set_ant = kenwood_set_ant, + //.get_ant = kenwood_get_ant, + //.send_morse = kenwood_send_morse, + //.wait_morse = rig_wait_morse, + //.send_voice_mem = kenwood_send_voice_mem, + //.stop_voice_mem = kenwood_stop_voice_mem, + //.vfo_op = kenwood_vfo_op, + //.scan = kenwood_scan, + //.set_mem = kenwood_set_mem, + //.get_mem = kenwood_get_mem, + //.get_channel = ts2000_get_channel, + //.set_channel = ts2000_set_channel, + //.set_trn = kenwood_set_trn, + //.get_trn = kenwood_get_trn, + //.set_powerstat = kenwood_set_powerstat, .get_powerstat = kenwood_get_powerstat, .get_info = kenwood_get_info, .reset = kenwood_reset, commit abd6b16ff248e80585c520bd32eaf5ca8c424f15 Merge: ccaec5c4d 130cc330a Author: Nate Bargmann <n0...@n0...> Date: Mon Jan 20 20:06:26 2025 -0600 Merge pull request #1663 from Hamlib/revert-1662-Hamlib-4.6.1 Revert "Prepare for 4.6.1 release" commit 130cc330a2e04d6eabff7d4dfa4de7bfe2bd95e3 Author: Nate Bargmann <n0...@n0...> Date: Mon Jan 20 20:06:11 2025 -0600 Revert "Prepare for 4.6.1 release" diff --git a/configure.ac b/configure.ac index 609db450d..9bf5390d2 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.6.1],[ham...@li...],[hamlib],[http://www.hamlib.org]) +AC_INIT([Hamlib],[4.7~git],[ham...@li...],[hamlib],[http://www.hamlib.org]) #AC_INIT([PRODUCT_NAME], [Hamlib]) #AC_DEFINE([Hamlib], [PRODUCT_VERSION_RESOURCE]) @@ -76,7 +76,7 @@ dnl See README.release on setting these values # Set them here to keep c++/Makefile and src/Makefile in sync. ABI_VERSION=4 ABI_REVISION=6 -ABI_PATCH=1 +ABI_PATCH=0 ABI_AGE=0 AC_DEFINE_UNQUOTED([ABI_VERSION], [$ABI_VERSION], [Frontend ABI version]) commit ccaec5c4dd0d693d97e056bd4d42b2b93de65ee1 Merge: 198c14818 3160921db Author: Nate Bargmann <n0...@n0...> Date: Mon Jan 20 20:05:51 2025 -0600 Merge pull request #1662 from N0NB/Hamlib-4.6.1 Prepare for 4.6.1 release ----------------------------------------------------------------------- Summary of changes: NEWS | 11 +++++++++ rigs/kenwood/ts2000.c | 67 +++++++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 31 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |