From 292da125661bd647c0334f7673a2f37e05f46175 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sun, 29 Jun 2025 22:19:49 +0200 Subject: [PATCH] Fix various methods Fixes: set_ptt set_rit set_rptr_offs set_rptr_shift set_split_freq set_ts set_xit vfo_op This is also swapping the arguments to make the vfo optional like in other methods. --- bindings/python/test_rig.py | 24 ++++++++++++++++-------- bindings/rig.swg | 16 ++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py index 8da10841b..f48cf43c4 100755 --- a/bindings/python/test_rig.py +++ b/bindings/python/test_rig.py @@ -207,11 +207,16 @@ class TestClass: assert rig.set_mode(0, 0, Hamlib.RIG_VFO_CURR) is None assert rig.set_parm(0, 0) is None assert rig.set_powerstat(0) is None - assert rig.set_ptt(0, 0) is None - assert rig.set_rit(0, 0) is None - assert rig.set_rptr_offs(0, 0) is None - assert rig.set_rptr_shift(0, 0) is None - assert rig.set_split_freq(0, 0) is None + assert rig.set_ptt(0) is None + assert rig.set_ptt(0, Hamlib.RIG_VFO_CURR) is None + assert rig.set_rit(0) is None + assert rig.set_rit(0, Hamlib.RIG_VFO_CURR) is None + assert rig.set_rptr_offs(0) is None + assert rig.set_rptr_offs(0, Hamlib.RIG_VFO_CURR) is None + assert rig.set_rptr_shift(0) is None + assert rig.set_rptr_shift(0, Hamlib.RIG_VFO_CURR) is None + assert rig.set_split_freq(0) is None + assert rig.set_split_freq(0, Hamlib.RIG_VFO_CURR) is None assert rig.set_split_freq_mode(0, 0) is None assert rig.set_split_freq_mode(0, 0, 0) is None assert rig.set_split_freq_mode(0, 0, 0, 0) is None @@ -221,12 +226,15 @@ class TestClass: assert rig.set_split_vfo(0, 0) is None assert rig.set_split_vfo(0, 0, 0) is None assert rig.set_trn(0) is None # deprecated - assert rig.set_ts(0, 0) is None + assert rig.set_ts(0) is None + assert rig.set_ts(0, Hamlib.RIG_VFO_CURR) is None assert rig.set_vfo(0) is None assert rig.set_vfo_opt(0) is None - assert rig.set_xit(0, 0) is None + assert rig.set_xit(0) is None + assert rig.set_xit(0, Hamlib.RIG_VFO_CURR) is None assert rig.token_lookup("") is None - assert rig.vfo_op(0, 0) is None + assert rig.vfo_op(0) is None + assert rig.vfo_op(0, Hamlib.RIG_VFO_CURR) is None def test_object_creation(self): diff --git a/bindings/rig.swg b/bindings/rig.swg index a136890b2..94ed1f058 100644 --- a/bindings/rig.swg +++ b/bindings/rig.swg @@ -366,20 +366,20 @@ typedef channel_t * const_channel_t_p; METHOD1(set_freq, freq_t) METHOD2_INIT(set_mode, rmode_t, pbwidth_t, RIG_PASSBAND_NORMAL) - METHOD3(set_ptt, ptt_t) - METHOD3(set_rptr_shift, rptr_shift_t) - METHOD3(set_rptr_offs, shortfreq_t) + METHOD1(set_ptt, ptt_t) + METHOD1(set_rptr_shift, rptr_shift_t) + METHOD1(set_rptr_offs, shortfreq_t) METHOD1(set_ctcss_tone, tone_t) METHOD1(set_dcs_code, tone_t) METHOD1(set_ctcss_sql, tone_t) METHOD1(set_dcs_sql, tone_t) - METHOD3(set_split_freq, freq_t) + METHOD1(set_split_freq, freq_t) METHOD2_INIT(set_split_mode, rmode_t, pbwidth_t, RIG_PASSBAND_NORMAL) METHOD3_INIT(set_split_freq_mode, freq_t, rmode_t, pbwidth_t, RIG_PASSBAND_NORMAL) METHOD2(set_split_vfo, split_t, vfo_t) - METHOD3(set_rit, shortfreq_t) - METHOD3(set_xit, shortfreq_t) - METHOD3(set_ts, shortfreq_t) + METHOD1(set_rit, shortfreq_t) + METHOD1(set_xit, shortfreq_t) + METHOD1(set_ts, shortfreq_t) METHOD2(set_ant, ant_t, value_t) METHOD2(set_func, setting_t, int) METHOD2(set_ext_func, hamlib_token_t, int) @@ -387,7 +387,7 @@ typedef channel_t * const_channel_t_p; METHOD1(set_mem, int) METHOD1(send_dtmf, const_char_string) METHOD1(send_morse, const_char_string) - METHOD3(vfo_op, vfo_op_t) + METHOD1(vfo_op, vfo_op_t) METHOD2(scan, scan_t, int) METHODSIMPLESET(level, int, i, RIG_LEVEL_IS_FLOAT(stg)) METHODSIMPLESET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg))