From: n0nb <n0...@us...> - 2025-08-19 17:48:03
|
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 c15fecb8655e7eac3da26efa0cb224b00844ca4a (commit) via fd7d69d24c132b6ef94be6df04031cf41cf73228 (commit) from 3fa91c8771981106539eb16e5b02212232793912 (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 c15fecb8655e7eac3da26efa0cb224b00844ca4a Merge: 3fa91c877 fd7d69d24 Author: Nate Bargmann <n0...@n0...> Date: Tue Aug 19 08:16:22 2025 -0500 Merge GitHub PR #1849 commit fd7d69d24c132b6ef94be6df04031cf41cf73228 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Aug 17 18:13:43 2025 +0200 Fix output of dump_state Fixes references to levels and properly handles strings. Steps to reproduce: tests/rigctl chk_vfo dump_state diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 711dd7502..d2fbcee7f 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -4828,7 +4828,9 @@ declare_proto_rig(dump_state) for (i = 0; i < RIG_SETTING_MAX; ++i) { - if (RIG_LEVEL_IS_FLOAT(i)) + setting_t level = rig_idx2setting(i); + + if (RIG_LEVEL_IS_FLOAT(level)) { fprintf(fout, "%d=%g,%g,%g;", i, rs->level_gran[i].min.f, rs->level_gran[i].max.f, rs->level_gran[i].step.f); @@ -4844,11 +4846,17 @@ declare_proto_rig(dump_state) for (i = 0; i < RIG_SETTING_MAX; ++i) { - if (RIG_LEVEL_IS_FLOAT(i)) + setting_t parm = rig_idx2setting(i); + + if (RIG_PARM_IS_FLOAT(parm)) { fprintf(fout, "%d=%g,%g,%g;", i, rs->parm_gran[i].min.f, rs->parm_gran[i].max.f, rs->parm_gran[i].step.f); } + else if (RIG_PARM_IS_STRING(parm)) + { + fprintf(fout, "%d=%s;", i, rs->parm_gran[i].step.cs); + } else { fprintf(fout, "%d=%d,%d,%d;", i, rs->level_gran[i].min.i, ----------------------------------------------------------------------- Summary of changes: tests/rigctl_parse.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |