[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 99047473585dcac9ccaff
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: n0nb <n0...@us...> - 2025-08-13 02:50: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, master has been updated via 99047473585dcac9ccaff6a87015f974b73e9fd8 (commit) via 2a2f33673ea987c3f314e58c90b0231349aa683e (commit) via 4187e9f4a31a1c4c7d7e5d456e6012007bf0dfeb (commit) from f32b744ac98a1d9e3c7231c46b4ae3b5323b4628 (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 99047473585dcac9ccaff6a87015f974b73e9fd8 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Aug 12 23:24:32 2025 +0200 Handle the question mark as second argument of set_level in ampctl Test command: tests/ampctl -m 1 \ set_level FAULT '?' \ set_level NH '?' \ set_level PF '?' \ set_level PWRFORWARD '?' \ set_level PWRINPUT '?' \ set_level PWRPEAK '?' \ set_level PWRREFLECTED '?' \ set_level SWR '?' diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c index e359b20b6..44705b8d5 100644 --- a/tests/ampctl_parse.c +++ b/tests/ampctl_parse.c @@ -1713,6 +1713,25 @@ declare_proto_amp(set_level) level = rig_parse_level(arg1); + if (!strcmp(arg2, "?")) + { + const gran_t *gran = STATE(amp)->level_gran; + int idx = rig_setting2idx(level); + + if (AMP_LEVEL_IS_FLOAT(level)) + { + fprintf(fout, "(%f..%f/%f)%c", gran[idx].min.f, + gran[idx].max.f, gran[idx].step.f, resp_sep); + } + else + { + fprintf(fout, "(%d..%d/%d)%c", gran[idx].min.i, + gran[idx].max.i, gran[idx].step.i, resp_sep); + } + + return RIG_OK; + } + // some Java apps send comma in international setups so substitute period char *p = strchr(arg2, ','); commit 2a2f33673ea987c3f314e58c90b0231349aa683e Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Aug 12 20:38:48 2025 +0200 Handle the question mark as second argument of set_level in rotctl Test command: tests/rotctl -m 1 \ set_level MGC '?' \ set_level MGF '?' \ set_level MGL '?' \ set_level SPEED '?' diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c index 9c0553e2f..861bbf41c 100644 --- a/tests/rotctl_parse.c +++ b/tests/rotctl_parse.c @@ -1950,6 +1950,25 @@ declare_proto_rot(set_level) level = rot_parse_level(arg1); + if (!strcmp(arg2, "?")) + { + const gran_t *gran = STATE(rot)->level_gran; + int idx = rig_setting2idx(level); + + if (ROT_LEVEL_IS_FLOAT(level)) + { + fprintf(fout, "(%f..%f/%f)%c", gran[idx].min.f, + gran[idx].max.f, gran[idx].step.f, resp_sep); + } + else + { + fprintf(fout, "(%d..%d/%d)%c", gran[idx].min.i, + gran[idx].max.i, gran[idx].step.i, resp_sep); + } + + return RIG_OK; + } + if (!rot_has_set_level(rot, level)) { const struct confparams *cfp; commit 4187e9f4a31a1c4c7d7e5d456e6012007bf0dfeb Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Aug 12 17:24:52 2025 +0200 Handle the question mark as second argument of set_level in rigctl Closes #720. Test command: tests/rigctl -m 1 \ set_level AF '?' set_level AGC '?' set_level AGC_TIME '?' \ set_level ANTIVOX '?' set_level APF '?' set_level ATT '?' \ set_level BAL '?' set_level BAND_SELECT '?' set_level BKINDL '?' \ set_level BKIN_DLYMS '?' set_level COMP '?' set_level CWPITCH '?' \ set_level IF '?' set_level KEYSPD '?' set_level METER '?' \ set_level MGC '?' set_level MGF '?' set_level MGL '?' \ set_level MICGAIN '?' set_level MONITOR_GAIN '?' set_level NB '?' \ set_level NOTCHF '?' set_level NOTCHF_RAW '?' set_level NR '?' \ set_level PBT_IN '?' set_level PBT_OUT '?' set_level PREAMP '?' \ set_level RF '?' set_level RFPOWER '?' set_level SLOPE_HIGH '?' \ set_level SLOPE_LOW '?' set_level SPECTRUM_ATT '?' set_level SPECTRUM_AVG '?' \ set_level SPECTRUM_EDGE_HIGH '?' set_level SPECTRUM_EDGE_LOW '?' set_level SPECTRUM_MODE '?' \ set_level SPECTRUM_REF '?' set_level SPECTRUM_SPAN '?' set_level SPECTRUM_SPEED '?' \ set_level SQL '?' set_level USB_AF '?' set_level USB_AF_INPUT '?' \ set_level VOXDELAY '?' set_level VOXGAIN '?' diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 4db850e87..732745b3f 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -3352,9 +3352,27 @@ declare_proto_rig(set_level) level = rig_parse_level(arg1); - if ((!strcmp(arg2, "?") || arg2[0] == 0) && level == RIG_LEVEL_METER) + if (!strcmp(arg2, "?")) { - fprintf(fout, "COMP ALC SWR ID/IC VDD DB PO TEMP%c", resp_sep); + if (level == RIG_LEVEL_METER) + { + fprintf(fout, "COMP ALC SWR ID/IC VDD DB PO TEMP%c", resp_sep); + } else { + const gran_t *gran = STATE(rig)->level_gran; + int idx = rig_setting2idx(level); + + if (RIG_LEVEL_IS_FLOAT(level)) + { + fprintf(fout, "(%f..%f/%f)%c", gran[idx].min.f, + gran[idx].max.f, gran[idx].step.f, resp_sep); + } + else + { + fprintf(fout, "(%d..%d/%d)%c", gran[idx].min.i, + gran[idx].max.i, gran[idx].step.i, resp_sep); + } + } + RETURNFUNC2(RIG_OK); } ----------------------------------------------------------------------- Summary of changes: tests/ampctl_parse.c | 19 +++++++++++++++++++ tests/rigctl_parse.c | 22 ++++++++++++++++++++-- tests/rotctl_parse.c | 19 +++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |