[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 96d5abab4750fdd7c9a08
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 96d5abab4750fdd7c9a08ef3abbab14955923dfd
|
From: n0nb <n0...@us...> - 2025-07-27 22:09:41
|
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 96d5abab4750fdd7c9a08ef3abbab14955923dfd (commit)
via eb5a838f3051f2d8a05557192586c4720575153c (commit)
via fae77e4c0273020844ea32abd7d64378820943d6 (commit)
via 389155fcdf94973903d007c0599576cb2b9e47be (commit)
via c4ee44b1353f6f9a802b6291e5628f00eee157d7 (commit)
via 62e42eb4b3269d2f30ba37f4d3584cc064028ddf (commit)
via 5c06c7b942151177f742e0da15bcd4b3b67b8eeb (commit)
via e54c38c522559349eb8d21d4fbeed98243666f5f (commit)
via 9574e761ff2fbc7b3bf1a758639837b0dd3cc6c0 (commit)
via e83d72608b61261d99f4b9c86fa755f0bb051a55 (commit)
via 36576f8e40e701a651e85c567201f9758f20545a (commit)
via 43193681b02938b06987224a2c572495638467d2 (commit)
via 9626c8b90dc4d76b3071e65dfb0372f4caba342c (commit)
via 5319f8b31b70da31144ed46ece9523b7f7eace9d (commit)
via a617863a238af7eab33e4d10a75dc3149cfff4e2 (commit)
via 2199ff2bde6b2d7dff5a7bd9b5880ea2cacced17 (commit)
via 3240d2f8d3d3a366c56d05249605a9a06123635b (commit)
via 92fb82f2204f45673374c9e40177f3b824d34180 (commit)
via ef2d2236b5267a2eaf395cb6ffdbd3627e40b4d2 (commit)
via 292da125661bd647c0334f7673a2f37e05f46175 (commit)
via 160c941e9e2018878bd876cd46ba78cb9add7e00 (commit)
via 25aae7d8e2ebc06c7c7094c0d42ceea8bc3d2c82 (commit)
via 90c56f3e1fc6d7d86d758076011408832197ca65 (commit)
via 01bc71ab8a2d24545f6d48ff90bd9c5c5747011f (commit)
via 2b1428fd3e41cc7830ded0d057fdac0a27d4c5b3 (commit)
via 8901b210ee0a9ff399904f1516350e65e2ed6de0 (commit)
via 13c2413bbaf3fb99c3448771b868ea3c5c032282 (commit)
via 25a2a4447f01eaaec83f5a95903f6e300ba0534b (commit)
from 0d543f9483f348c1f6bc8ff0375034590cf9da85 (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 96d5abab4750fdd7c9a08ef3abbab14955923dfd
Merge: eb5a838f3 0d543f948
Author: dforsi <iu...@gm...>
Date: Sun Jul 27 18:22:26 2025 +0200
Merge branch 'master' into fix/pytest
commit eb5a838f3051f2d8a05557192586c4720575153c
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jul 13 17:19:17 2025 +0200
Check datatype before actual value
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 8c8c0c672..597578289 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -58,8 +58,8 @@ class TestClass:
assert rig.get_freq() == 5700000000.0
frequency = 5700000000.5
assert rig.set_freq(Hamlib.RIG_VFO_CURR, frequency) is None
- assert rig.get_freq(Hamlib.RIG_VFO_CURR) == 5700000000.5
assert isinstance(rig.get_freq(Hamlib.RIG_VFO_CURR), float)
+ assert rig.get_freq(Hamlib.RIG_VFO_CURR) == 5700000000.5
# VFO
commit fae77e4c0273020844ea32abd7d64378820943d6
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jul 13 17:13:37 2025 +0200
Do the tests for set_vfo() and get_vfo() when the rig is open
Hamlib returns -RIG_EINVAL if the rig is not open.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 276841f6c..8c8c0c672 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -63,6 +63,8 @@ class TestClass:
# VFO
+ assert rig.set_vfo(Hamlib.RIG_VFO_A) is None
+ assert rig.get_vfo() == Hamlib.RIG_VFO_A
assert rig.set_split_vfo(Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_A) is None
assert rig.get_split_vfo(Hamlib.RIG_VFO_TX) == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_A]
assert rig.set_split_vfo(Hamlib.RIG_SPLIT_ON, Hamlib.RIG_VFO_B) is None
@@ -163,7 +165,6 @@ class TestClass:
assert isinstance(rig.get_trn(), int) # deprecated
assert isinstance(rig.get_ts(), int)
assert isinstance(rig.get_ts(Hamlib.RIG_VFO_CURR), int)
- assert isinstance(rig.get_vfo(), int)
assert len(rig.get_vfo_info()) == 5
assert len(rig.get_vfo_info(Hamlib.RIG_VFO_CURR)) == 5
# assert rig_has_get_func(0) FIXME not defined
@@ -226,7 +227,6 @@ class TestClass:
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_vfo(0) is None
assert rig.set_vfo_opt(0) is None
assert rig.token_lookup("") is None
assert rig.vfo_op(0, 0) is None
commit 389155fcdf94973903d007c0599576cb2b9e47be
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jul 13 17:04:55 2025 +0200
Do the tests for RIT and XIT when the rig is open
Hamlib returns -RIG_EINVAL if the rig is not open.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index d0560b808..276841f6c 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -71,6 +71,15 @@ class TestClass:
assert rig.get_split_vfo() == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_B]
assert rig.get_split_vfo(Hamlib.RIG_VFO_CURR) == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_B]
+ # RIT and XIT
+
+ assert rig.set_rit(Hamlib.RIG_VFO_CURR, 100) is None
+ assert rig.get_rit() == 100
+ assert rig.get_rit(Hamlib.RIG_VFO_CURR) == 100
+ assert rig.set_xit(Hamlib.RIG_VFO_CURR, 200) is None
+ assert rig.get_xit() == 200
+ assert rig.get_xit(Hamlib.RIG_VFO_CURR) == 200
+
# Antenna
# FIXME should use a RIG_ANT_* constant but they aren't available in the bindings
@@ -143,8 +152,6 @@ class TestClass:
assert isinstance(rig.get_powerstat(), int)
assert isinstance(rig.get_ptt(), int)
assert isinstance(rig.get_ptt(Hamlib.RIG_VFO_CURR), int)
- assert isinstance(rig.get_rit(), int)
- assert isinstance(rig.get_rit(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_rptr_offs(), int)
assert isinstance(rig.get_rptr_offs(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_rptr_shift(), int)
@@ -159,8 +166,6 @@ class TestClass:
assert isinstance(rig.get_vfo(), int)
assert len(rig.get_vfo_info()) == 5
assert len(rig.get_vfo_info(Hamlib.RIG_VFO_CURR)) == 5
- assert isinstance(rig.get_xit(), int)
- assert isinstance(rig.get_xit(Hamlib.RIG_VFO_CURR), int)
# assert rig_has_get_func(0) FIXME not defined
assert rig.has_get_level(0) is None # FIXME should return setting_t
# assert rig_has_get_parm(0) FIXME not defined
@@ -208,7 +213,6 @@ class TestClass:
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
@@ -224,7 +228,6 @@ class TestClass:
assert rig.set_ts(0, 0) 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.token_lookup("") is None
assert rig.vfo_op(0, 0) is None
commit c4ee44b1353f6f9a802b6291e5628f00eee157d7
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jul 13 16:51:29 2025 +0200
Swap arguments of Rig.set_dcs_sql() and make both mandatory
Makes the signature of Rig.set_dcs_sql() similar to those of
set_ctcss_sql() set_ctcss_tone() set_dcs_code()
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 2b86372f0..d0560b808 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -96,9 +96,8 @@ class TestClass:
assert rig.set_dcs_code(Hamlib.RIG_VFO_CURR, 125) is None
assert rig.get_dcs_code() == 125
assert rig.get_dcs_code(Hamlib.RIG_VFO_CURR) == 125
- assert rig.set_dcs_sql(311) is None
- assert rig.get_dcs_sql() == 311
- assert rig.set_dcs_sql(134, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_dcs_sql(Hamlib.RIG_VFO_CURR, 134) is None
+ assert rig.get_dcs_sql() == 134
assert rig.get_dcs_sql(Hamlib.RIG_VFO_CURR) == 134
assert rig.close() is None
diff --git a/bindings/rig.swg b/bindings/rig.swg
index f2ee04e53..2245d0155 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -372,7 +372,7 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_ctcss_tone, tone_t)
METHOD3(set_dcs_code, tone_t)
METHOD3(set_ctcss_sql, tone_t)
- METHOD1(set_dcs_sql, tone_t)
+ METHOD3(set_dcs_sql, tone_t)
METHOD3(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)
commit 62e42eb4b3269d2f30ba37f4d3584cc064028ddf
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 22:40:36 2025 +0200
Do the tests for tones when the rig is open
Hamlib returns -RIG_EINVAL if the rig is not open.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index b765b3e36..2b86372f0 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -85,6 +85,22 @@ class TestClass:
assert rig.set_ant(RIG_ANT_1, option, Hamlib.RIG_VFO_CURR) is None
assert rig.get_ant(RIG_ANT_CURR, Hamlib.RIG_VFO_A) == expected
+ # Squelch codes and tones
+
+ assert rig.set_ctcss_sql(Hamlib.RIG_VFO_CURR, 885) is None
+ assert rig.get_ctcss_sql() == 885
+ assert rig.get_ctcss_sql(Hamlib.RIG_VFO_CURR) == 885
+ assert rig.set_ctcss_tone(Hamlib.RIG_VFO_CURR, 854) is None
+ assert rig.get_ctcss_tone() == 854
+ assert rig.get_ctcss_tone(Hamlib.RIG_VFO_CURR) == 854
+ assert rig.set_dcs_code(Hamlib.RIG_VFO_CURR, 125) is None
+ assert rig.get_dcs_code() == 125
+ assert rig.get_dcs_code(Hamlib.RIG_VFO_CURR) == 125
+ assert rig.set_dcs_sql(311) is None
+ assert rig.get_dcs_sql() == 311
+ assert rig.set_dcs_sql(134, Hamlib.RIG_VFO_CURR) is None
+ assert rig.get_dcs_sql(Hamlib.RIG_VFO_CURR) == 134
+
assert rig.close() is None
assert rig.state.comm_state == 0
info = rig.get_info()
@@ -105,16 +121,8 @@ class TestClass:
assert isinstance(rig.get_channel(channel, Hamlib.RIG_VFO_CURR), Hamlib.channel)
assert isinstance(rig.get_channel(channel, Hamlib.RIG_VFO_CURR, readonly), Hamlib.channel)
assert isinstance(rig.get_conf(""), str)
- assert isinstance(rig.get_ctcss_sql(), int)
- assert isinstance(rig.get_ctcss_sql(Hamlib.RIG_VFO_CURR), int)
- assert isinstance(rig.get_ctcss_tone(), int)
- assert isinstance(rig.get_ctcss_tone(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_dcd(), int)
assert isinstance(rig.get_dcd(Hamlib.RIG_VFO_CURR), int)
- assert isinstance(rig.get_dcs_code(), int)
- assert isinstance(rig.get_dcs_code(Hamlib.RIG_VFO_CURR), int)
- assert isinstance(rig.get_dcs_sql(), int)
- assert isinstance(rig.get_dcs_sql(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_ext_func(0), int)
assert isinstance(rig.get_ext_func(0, 0), int)
assert rig.get_ext_level(0) is None
@@ -184,11 +192,6 @@ class TestClass:
channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
assert rig.set_channel(channel) is None
assert rig.set_conf("", "") is None
- assert rig.set_ctcss_sql(Hamlib.RIG_VFO_CURR, 0) is None
- assert rig.set_ctcss_tone(Hamlib.RIG_VFO_CURR, 0) is None
- assert rig.set_dcs_code(Hamlib.RIG_VFO_CURR, 0) is None
- assert rig.set_dcs_sql(0) is None
- assert rig.set_dcs_sql(0, Hamlib.RIG_VFO_CURR) is None
assert rig.set_ext_func(0, 0) is None
assert rig.set_ext_func(0, 0, 0) is None
level = 0
commit 5c06c7b942151177f742e0da15bcd4b3b67b8eeb
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 22:07:02 2025 +0200
Add tests for Rig.set_freq() and Rig.get_freq()
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 6590fa9f3..b765b3e36 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -51,6 +51,16 @@ class TestClass:
info = rig.get_info()
assert isinstance(info, str)
+ # Frequency
+
+ frequency = 5700000000
+ assert rig.set_freq(Hamlib.RIG_VFO_CURR, frequency) is None
+ assert rig.get_freq() == 5700000000.0
+ frequency = 5700000000.5
+ assert rig.set_freq(Hamlib.RIG_VFO_CURR, frequency) is None
+ assert rig.get_freq(Hamlib.RIG_VFO_CURR) == 5700000000.5
+ assert isinstance(rig.get_freq(Hamlib.RIG_VFO_CURR), float)
+
# VFO
assert rig.set_split_vfo(Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_A) is None
@@ -110,8 +120,6 @@ class TestClass:
assert rig.get_ext_level(0) is None
assert rig.get_ext_level(0, 0) is None
assert rig.get_ext_parm(0) is None
- assert isinstance(rig.get_freq(), float)
- assert isinstance(rig.get_freq(Hamlib.RIG_VFO_CURR), float)
assert isinstance(rig.get_func(0), int)
assert isinstance(rig.get_func(0, 0), int)
assert rig.get_info() is None
@@ -189,8 +197,6 @@ class TestClass:
assert rig.set_ext_level(level, value, Hamlib.RIG_VFO_CURR) is None
value = Hamlib.value_t()
assert rig.set_ext_parm(0, value) is None
- freq = 5700000000
- assert rig.set_freq(Hamlib.RIG_VFO_CURR, freq) is None
assert rig.set_func(0, 0, 0) is None
assert rig.set_level(0, 0, 0) is None
assert rig.set_mem(0, 0) is None
commit e54c38c522559349eb8d21d4fbeed98243666f5f
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 22:01:54 2025 +0200
Add comments to group tests
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index b43dc9c9b..6590fa9f3 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -51,13 +51,17 @@ class TestClass:
info = rig.get_info()
assert isinstance(info, str)
- assert rig.set_split_vfo(-600000, Hamlib.RIG_VFO_A) is None
- assert rig.get_split_vfo(Hamlib.RIG_VFO_TX) == [-600000, 1]
- assert rig.set_split_vfo(5000000, Hamlib.RIG_VFO_B) is None
- assert rig.get_split_vfo(Hamlib.RIG_VFO_TX) == [5000000, 2]
- assert rig.set_split_vfo(5000000, Hamlib.RIG_VFO_CURR) is None
- assert rig.get_split_vfo() == [5000000, 1]
- assert rig.get_split_vfo(Hamlib.RIG_VFO_CURR) == [5000000, 1]
+ # VFO
+
+ assert rig.set_split_vfo(Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_A) is None
+ assert rig.get_split_vfo(Hamlib.RIG_VFO_TX) == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_A]
+ assert rig.set_split_vfo(Hamlib.RIG_SPLIT_ON, Hamlib.RIG_VFO_B) is None
+ assert rig.get_split_vfo(Hamlib.RIG_VFO_TX) == [Hamlib.RIG_SPLIT_ON, Hamlib.RIG_VFO_B]
+ assert rig.set_split_vfo(Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_CURR) is None
+ assert rig.get_split_vfo() == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_B]
+ assert rig.get_split_vfo(Hamlib.RIG_VFO_CURR) == [Hamlib.RIG_SPLIT_OFF, Hamlib.RIG_VFO_B]
+
+ # Antenna
# FIXME should use a RIG_ANT_* constant but they aren't available in the bindings
RIG_ANT_1 = 1<<0
commit 9574e761ff2fbc7b3bf1a758639837b0dd3cc6c0
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 21:48:53 2025 +0200
Add meaningful arguments
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 3197b1033..b43dc9c9b 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -92,15 +92,15 @@ class TestClass:
assert isinstance(rig.get_channel(channel, Hamlib.RIG_VFO_CURR, readonly), Hamlib.channel)
assert isinstance(rig.get_conf(""), str)
assert isinstance(rig.get_ctcss_sql(), int)
- assert isinstance(rig.get_ctcss_sql(0), int)
+ assert isinstance(rig.get_ctcss_sql(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_ctcss_tone(), int)
- assert isinstance(rig.get_ctcss_tone(0), int)
+ assert isinstance(rig.get_ctcss_tone(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_dcd(), int)
- assert isinstance(rig.get_dcd(Hamlib.RIG_VFO_CURR,), int)
+ assert isinstance(rig.get_dcd(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_dcs_code(), int)
- assert isinstance(rig.get_dcs_code(0), int)
+ assert isinstance(rig.get_dcs_code(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_dcs_sql(), int)
- assert isinstance(rig.get_dcs_sql(0), int)
+ assert isinstance(rig.get_dcs_sql(Hamlib.RIG_VFO_CURR), int)
assert isinstance(rig.get_ext_func(0), int)
assert isinstance(rig.get_ext_func(0, 0), int)
assert rig.get_ext_level(0) is None
@@ -172,11 +172,11 @@ class TestClass:
channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
assert rig.set_channel(channel) is None
assert rig.set_conf("", "") is None
- assert rig.set_ctcss_sql(0, 0) is None
- assert rig.set_ctcss_tone(0, 0) is None
- assert rig.set_dcs_code(0, 0) is None
+ assert rig.set_ctcss_sql(Hamlib.RIG_VFO_CURR, 0) is None
+ assert rig.set_ctcss_tone(Hamlib.RIG_VFO_CURR, 0) is None
+ assert rig.set_dcs_code(Hamlib.RIG_VFO_CURR, 0) is None
assert rig.set_dcs_sql(0) is None
- assert rig.set_dcs_sql(0, 0) is None
+ assert rig.set_dcs_sql(0, Hamlib.RIG_VFO_CURR) is None
assert rig.set_ext_func(0, 0) is None
assert rig.set_ext_func(0, 0, 0) is None
level = 0
commit e83d72608b61261d99f4b9c86fa755f0bb051a55
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 20:14:04 2025 +0200
Fix the tests
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 0ecebd9bf..3197b1033 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -63,8 +63,12 @@ class TestClass:
RIG_ANT_1 = 1<<0
RIG_ANT_UNKNOWN = 1<<30
RIG_ANT_CURR = 1<<31
+ option = Hamlib.value_t()
+ option.i = 0
expected = [RIG_ANT_UNKNOWN, RIG_ANT_UNKNOWN, RIG_ANT_1, 0]
+ assert rig.set_ant(RIG_ANT_1, option) is None
assert rig.get_ant(RIG_ANT_CURR) == expected
+ assert rig.set_ant(RIG_ANT_1, option, Hamlib.RIG_VFO_CURR) is None
assert rig.get_ant(RIG_ANT_CURR, Hamlib.RIG_VFO_A) == expected
assert rig.close() is None
@@ -161,15 +165,8 @@ class TestClass:
assert rig.scan(Hamlib.RIG_SCAN_VFO, channel, Hamlib.RIG_VFO_CURR) is None
assert rig.send_dtmf(Hamlib.RIG_VFO_CURR, "*0123456789#ABCD") is None
assert rig.send_morse(Hamlib.RIG_VFO_CURR, "73") is None
- # FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
- RIG_ANT_1 = 1<<0
- option = Hamlib.value_t()
- option.i = 0
- assert rig.set_ant(Hamlib.RIG_VFO_CURR, option) is None
- assert rig.set_ant(Hamlib.RIG_VFO_CURR, option, RIG_ANT_1) is None
bank = 0
- assert rig.set_bank(bank) is None
- assert rig.set_bank(bank, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_bank(Hamlib.RIG_VFO_CURR, bank) is None
channel = Hamlib.channel()
channel = Hamlib.channel(0)
channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
@@ -188,9 +185,8 @@ class TestClass:
assert rig.set_ext_level(level, value, Hamlib.RIG_VFO_CURR) is None
value = Hamlib.value_t()
assert rig.set_ext_parm(0, value) is None
- freq = 0
- assert rig.set_freq(freq) is None
- assert rig.set_freq(freq, Hamlib.RIG_VFO_CURR) is None
+ freq = 5700000000
+ assert rig.set_freq(Hamlib.RIG_VFO_CURR, freq) is None
assert rig.set_func(0, 0, 0) is None
assert rig.set_level(0, 0, 0) is None
assert rig.set_mem(0, 0) is None
commit 36576f8e40e701a651e85c567201f9758f20545a
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 20:06:48 2025 +0200
Revert "Fix Rig.send_morse()"
This reverts commit 656cf536524197c56d0523d424ba4eacfdbbc278.
Conflicts:
bindings/python/test_rig.py
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index e5f3c38ab..0ecebd9bf 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -160,8 +160,7 @@ class TestClass:
assert rig.scan(Hamlib.RIG_SCAN_VFO, channel) is None
assert rig.scan(Hamlib.RIG_SCAN_VFO, channel, Hamlib.RIG_VFO_CURR) is None
assert rig.send_dtmf(Hamlib.RIG_VFO_CURR, "*0123456789#ABCD") is None
- assert rig.send_morse("73") is None
- assert rig.send_morse("73", Hamlib.RIG_VFO_CURR) is None
+ assert rig.send_morse(Hamlib.RIG_VFO_CURR, "73") is None
# FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
RIG_ANT_1 = 1<<0
option = Hamlib.value_t()
diff --git a/bindings/python/test_startup.py b/bindings/python/test_startup.py
index 4620ce4dc..e38cc355d 100755
--- a/bindings/python/test_startup.py
+++ b/bindings/python/test_startup.py
@@ -83,7 +83,7 @@ class TestClass:
#(freq, width, mode, split) = my_rig.get_vfo_info(Hamlib.RIG_VFO_A,freq,width,mode,split)
#print("Rig vfo_info:\t\tfreq=%s, mode=%s, width=%s, split=%s" % (freq, mode, width, split))
- assert my_rig.send_morse("73", Hamlib.RIG_VFO_A) is None
+ assert my_rig.send_morse(Hamlib.RIG_VFO_A, "73") is None
assert my_rig.close() is None
# Some static functions
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 096b75b0b..f2ee04e53 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -386,7 +386,7 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_bank, int)
METHOD3(set_mem, int)
METHOD3(send_dtmf, const_char_string)
- METHOD1(send_morse, const_char_string)
+ METHOD3(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
METHOD2(scan, scan_t, int)
METHODSIMPLESET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
commit 43193681b02938b06987224a2c572495638467d2
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 20:00:24 2025 +0200
Revert "Fix Rig.send_dtmf()"
This reverts commit 0e3a90bb351f9a412c5920981ea7cdc18855c4cc.
Conflicts:
bindings/python/test_rig.py
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 37cb1ebda..e5f3c38ab 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -159,8 +159,7 @@ class TestClass:
channel = 0
assert rig.scan(Hamlib.RIG_SCAN_VFO, channel) is None
assert rig.scan(Hamlib.RIG_SCAN_VFO, channel, Hamlib.RIG_VFO_CURR) is None
- assert rig.send_dtmf("*0123456789#ABCD") is None
- assert rig.send_dtmf("*0123456789#ABCD", Hamlib.RIG_VFO_CURR) is None
+ assert rig.send_dtmf(Hamlib.RIG_VFO_CURR, "*0123456789#ABCD") is None
assert rig.send_morse("73") is None
assert rig.send_morse("73", Hamlib.RIG_VFO_CURR) is None
# FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 4fe50342f..096b75b0b 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -385,7 +385,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_ext_func, hamlib_token_t, int)
METHOD3(set_bank, int)
METHOD3(set_mem, int)
- METHOD1(send_dtmf, const_char_string)
+ METHOD3(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
METHOD2(scan, scan_t, int)
commit 9626c8b90dc4d76b3071e65dfb0372f4caba342c
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:57:48 2025 +0200
Revert "Fix Rig.set_bank()"
This reverts commit 04d675fc55266f3a96e52487b181c82536139b22.
diff --git a/bindings/rig.swg b/bindings/rig.swg
index cd30821c2..4fe50342f 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -383,7 +383,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_ant, ant_t, value_t)
METHOD2(set_func, setting_t, int)
METHOD2(set_ext_func, hamlib_token_t, int)
- METHOD1(set_bank, int)
+ METHOD3(set_bank, int)
METHOD3(set_mem, int)
METHOD1(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
commit 5319f8b31b70da31144ed46ece9523b7f7eace9d
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:57:43 2025 +0200
Revert "Fix Rig.set_freq()"
This reverts commit 070efb7b4127f0b5626596d071d6c68fcee1d3de.
diff --git a/bindings/python/test_startup.py b/bindings/python/test_startup.py
index a0835ce86..4620ce4dc 100755
--- a/bindings/python/test_startup.py
+++ b/bindings/python/test_startup.py
@@ -33,7 +33,7 @@ class TestClass:
assert my_rig.error_status == Hamlib.RIG_OK
assert Hamlib.rigerror2(my_rig.error_status) == "Command completed successfully\n"
- assert my_rig.set_freq(5700000000, Hamlib.RIG_VFO_B) is None
+ assert my_rig.set_freq(Hamlib.RIG_VFO_B, 5700000000) is None
assert my_rig.set_vfo(Hamlib.RIG_VFO_B) is None
assert my_rig.get_freq() == 5700000000
diff --git a/bindings/rig.swg b/bindings/rig.swg
index f0b6a911e..cd30821c2 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -364,7 +364,7 @@ typedef channel_t * const_channel_t_p;
#define _VFO_ARG ,vfo
#define _VFO_DECL ,vfo_t vfo = RIG_VFO_CURR
- METHOD1(set_freq, freq_t)
+ METHOD3(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)
commit a617863a238af7eab33e4d10a75dc3149cfff4e2
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:57:14 2025 +0200
Revert "Fix Rig.set_mem()"
This reverts commit 663612051c7fcc455c978c9f82889e2a9ab4836d.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index de7c3a285..37cb1ebda 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -195,8 +195,7 @@ class TestClass:
assert rig.set_freq(freq, Hamlib.RIG_VFO_CURR) is None
assert rig.set_func(0, 0, 0) is None
assert rig.set_level(0, 0, 0) is None
- assert rig.set_mem(0) is None
- assert rig.set_mem(0, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_mem(0, 0) is None
assert rig.set_mode(0) is None
assert rig.set_mode(0, 0) is None
assert rig.set_mode(0, 0, Hamlib.RIG_VFO_CURR) is None
diff --git a/bindings/rig.swg b/bindings/rig.swg
index cfe6ee865..f0b6a911e 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -384,7 +384,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_func, setting_t, int)
METHOD2(set_ext_func, hamlib_token_t, int)
METHOD1(set_bank, int)
- METHOD1(set_mem, int)
+ METHOD3(set_mem, int)
METHOD1(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
commit 2199ff2bde6b2d7dff5a7bd9b5880ea2cacced17
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:56:59 2025 +0200
Revert "Fix Rig.set_ctcss_sql() Rig.set_ctcss_tone() Rig.set_dcs_code()"
This reverts commit ed7e5b2344ccabe0abf5d4f215345acf86aa834f.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 8da10841b..de7c3a285 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -177,16 +177,11 @@ class TestClass:
channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
assert rig.set_channel(channel) is None
assert rig.set_conf("", "") is None
- tone = 0
- assert rig.set_ctcss_sql(tone) is None
- assert rig.set_ctcss_sql(tone, Hamlib.RIG_VFO_CURR) is None
- assert rig.set_ctcss_tone(tone) is None
- assert rig.set_ctcss_tone(tone, Hamlib.RIG_VFO_CURR) is None
- code = 0
- assert rig.set_dcs_code(code) is None
- assert rig.set_dcs_code(code, Hamlib.RIG_VFO_CURR) is None
- assert rig.set_dcs_sql(code) is None
- assert rig.set_dcs_sql(code, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_ctcss_sql(0, 0) is None
+ assert rig.set_ctcss_tone(0, 0) is None
+ assert rig.set_dcs_code(0, 0) is None
+ assert rig.set_dcs_sql(0) is None
+ assert rig.set_dcs_sql(0, 0) is None
assert rig.set_ext_func(0, 0) is None
assert rig.set_ext_func(0, 0, 0) is None
level = 0
diff --git a/bindings/rig.swg b/bindings/rig.swg
index a136890b2..cfe6ee865 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -369,9 +369,9 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_ptt, ptt_t)
METHOD3(set_rptr_shift, rptr_shift_t)
METHOD3(set_rptr_offs, shortfreq_t)
- METHOD1(set_ctcss_tone, tone_t)
- METHOD1(set_dcs_code, tone_t)
- METHOD1(set_ctcss_sql, tone_t)
+ METHOD3(set_ctcss_tone, tone_t)
+ METHOD3(set_dcs_code, tone_t)
+ METHOD3(set_ctcss_sql, tone_t)
METHOD1(set_dcs_sql, tone_t)
METHOD3(set_split_freq, freq_t)
METHOD2_INIT(set_split_mode, rmode_t, pbwidth_t, RIG_PASSBAND_NORMAL)
commit 3240d2f8d3d3a366c56d05249605a9a06123635b
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:56:43 2025 +0200
Revert "Fix various methods"
This reverts commit 623b93db3dfb5c80aa89f67eb2eb2eff4c044faa.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index f48cf43c4..8da10841b 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -207,16 +207,11 @@ 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) 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_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_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
@@ -226,15 +221,12 @@ 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) is None
- assert rig.set_ts(0, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_ts(0, 0) is None
assert rig.set_vfo(0) is None
assert rig.set_vfo_opt(0) is None
- assert rig.set_xit(0) is None
- assert rig.set_xit(0, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_xit(0, 0) is None
assert rig.token_lookup("") is None
- assert rig.vfo_op(0) is None
- assert rig.vfo_op(0, Hamlib.RIG_VFO_CURR) is None
+ assert rig.vfo_op(0, 0) is None
def test_object_creation(self):
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 94ed1f058..a136890b2 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)
- METHOD1(set_ptt, ptt_t)
- METHOD1(set_rptr_shift, rptr_shift_t)
- METHOD1(set_rptr_offs, shortfreq_t)
+ METHOD3(set_ptt, ptt_t)
+ METHOD3(set_rptr_shift, rptr_shift_t)
+ METHOD3(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)
- METHOD1(set_split_freq, freq_t)
+ METHOD3(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)
- METHOD1(set_rit, shortfreq_t)
- METHOD1(set_xit, shortfreq_t)
- METHOD1(set_ts, shortfreq_t)
+ METHOD3(set_rit, shortfreq_t)
+ METHOD3(set_xit, shortfreq_t)
+ METHOD3(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)
- METHOD1(vfo_op, vfo_op_t)
+ METHOD3(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))
commit 92fb82f2204f45673374c9e40177f3b824d34180
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 12 19:56:18 2025 +0200
Revert "Remove the macro METHOD3() which is unused now"
This reverts commit 1eeb59e50c2fe34a59d46b3002c09355c798a528.
diff --git a/bindings/rig.swg b/bindings/rig.swg
index ebf646bcc..94ed1f058 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -89,6 +89,8 @@ typedef channel_t * const_channel_t_p;
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2); }
#define METHOD2_INIT(f, t1, t2, i2) void f (t1 _##t1##_1, t2 _##t2##_2 = i2 _VFO_DECL) \
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2); }
+#define METHOD3(f, t1) void f ( vfo_t vfo, t1 _##t1) \
+ { self->error_status = rig_##f(self->rig _VFO_ARG, _##t1); }
#define METHOD3_INIT(f, t1, t2, t3, i3) void f (t1 _##t1##_1, t2 _##t2##_2, t3 _##t3##_3 = i3 _VFO_DECL) \
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2, _##t3##_3); }
#define METHOD4(f, t1) void f ( vfo_t vfo, t1 _##t1) \
commit ef2d2236b5267a2eaf395cb6ffdbd3627e40b4d2
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 22:33:14 2025 +0200
Remove the macro METHOD3() which is unused now
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 94ed1f058..ebf646bcc 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -89,8 +89,6 @@ typedef channel_t * const_channel_t_p;
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2); }
#define METHOD2_INIT(f, t1, t2, i2) void f (t1 _##t1##_1, t2 _##t2##_2 = i2 _VFO_DECL) \
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2); }
-#define METHOD3(f, t1) void f ( vfo_t vfo, t1 _##t1) \
- { self->error_status = rig_##f(self->rig _VFO_ARG, _##t1); }
#define METHOD3_INIT(f, t1, t2, t3, i3) void f (t1 _##t1##_1, t2 _##t2##_2, t3 _##t3##_3 = i3 _VFO_DECL) \
{ self->error_status = rig_##f(self->rig _VFO_ARG, _##t1##_1, _##t2##_2, _##t3##_3); }
#define METHOD4(f, t1) void f ( vfo_t vfo, t1 _##t1) \
commit 292da125661bd647c0334f7673a2f37e05f46175
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 22:19:49 2025 +0200
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.
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))
commit 160c941e9e2018878bd876cd46ba78cb9add7e00
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 22:05:23 2025 +0200
Fix Rig.set_ctcss_sql() Rig.set_ctcss_tone() Rig.set_dcs_code()
This is also swapping the arguments to make the vfo optional
like in other methods.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index de7c3a285..8da10841b 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -177,11 +177,16 @@ class TestClass:
channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
assert rig.set_channel(channel) is None
assert rig.set_conf("", "") is None
- assert rig.set_ctcss_sql(0, 0) is None
- assert rig.set_ctcss_tone(0, 0) is None
- assert rig.set_dcs_code(0, 0) is None
- assert rig.set_dcs_sql(0) is None
- assert rig.set_dcs_sql(0, 0) is None
+ tone = 0
+ assert rig.set_ctcss_sql(tone) is None
+ assert rig.set_ctcss_sql(tone, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_ctcss_tone(tone) is None
+ assert rig.set_ctcss_tone(tone, Hamlib.RIG_VFO_CURR) is None
+ code = 0
+ assert rig.set_dcs_code(code) is None
+ assert rig.set_dcs_code(code, Hamlib.RIG_VFO_CURR) is None
+ assert rig.set_dcs_sql(code) is None
+ assert rig.set_dcs_sql(code, Hamlib.RIG_VFO_CURR) is None
assert rig.set_ext_func(0, 0) is None
assert rig.set_ext_func(0, 0, 0) is None
level = 0
diff --git a/bindings/rig.swg b/bindings/rig.swg
index cfe6ee865..a136890b2 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -369,9 +369,9 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_ptt, ptt_t)
METHOD3(set_rptr_shift, rptr_shift_t)
METHOD3(set_rptr_offs, shortfreq_t)
- METHOD3(set_ctcss_tone, tone_t)
- METHOD3(set_dcs_code, tone_t)
- METHOD3(set_ctcss_sql, tone_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)
METHOD2_INIT(set_split_mode, rmode_t, pbwidth_t, RIG_PASSBAND_NORMAL)
commit 25aae7d8e2ebc06c7c7094c0d42ceea8bc3d2c82
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 21:38:08 2025 +0200
Fix Rig.set_mem()
This is also swapping the arguments to make the vfo optional
like in other methods.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 37cb1ebda..de7c3a285 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -195,7 +195,8 @@ class TestClass:
assert rig.set_freq(freq, Hamlib.RIG_VFO_CURR) is None
assert rig.set_func(0, 0, 0) is None
assert rig.set_level(0, 0, 0) is None
- assert rig.set_mem(0, 0) is None
+ assert rig.set_mem(0) is None
+ assert rig.set_mem(0, Hamlib.RIG_VFO_CURR) is None
assert rig.set_mode(0) is None
assert rig.set_mode(0, 0) is None
assert rig.set_mode(0, 0, Hamlib.RIG_VFO_CURR) is None
diff --git a/bindings/rig.swg b/bindings/rig.swg
index f0b6a911e..cfe6ee865 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -384,7 +384,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_func, setting_t, int)
METHOD2(set_ext_func, hamlib_token_t, int)
METHOD1(set_bank, int)
- METHOD3(set_mem, int)
+ METHOD1(set_mem, int)
METHOD1(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
commit 90c56f3e1fc6d7d86d758076011408832197ca65
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 21:30:40 2025 +0200
Fix Rig.set_freq()
This is also swapping the arguments to make the vfo optional
like in other methods.
diff --git a/bindings/python/test_startup.py b/bindings/python/test_startup.py
index 4620ce4dc..a0835ce86 100755
--- a/bindings/python/test_startup.py
+++ b/bindings/python/test_startup.py
@@ -33,7 +33,7 @@ class TestClass:
assert my_rig.error_status == Hamlib.RIG_OK
assert Hamlib.rigerror2(my_rig.error_status) == "Command completed successfully\n"
- assert my_rig.set_freq(Hamlib.RIG_VFO_B, 5700000000) is None
+ assert my_rig.set_freq(5700000000, Hamlib.RIG_VFO_B) is None
assert my_rig.set_vfo(Hamlib.RIG_VFO_B) is None
assert my_rig.get_freq() == 5700000000
diff --git a/bindings/rig.swg b/bindings/rig.swg
index cd30821c2..f0b6a911e 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -364,7 +364,7 @@ typedef channel_t * const_channel_t_p;
#define _VFO_ARG ,vfo
#define _VFO_DECL ,vfo_t vfo = RIG_VFO_CURR
- METHOD3(set_freq, freq_t)
+ 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)
commit 01bc71ab8a2d24545f6d48ff90bd9c5c5747011f
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 21:26:22 2025 +0200
Fix Rig.set_bank()
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 4fe50342f..cd30821c2 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -383,7 +383,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_ant, ant_t, value_t)
METHOD2(set_func, setting_t, int)
METHOD2(set_ext_func, hamlib_token_t, int)
- METHOD3(set_bank, int)
+ METHOD1(set_bank, int)
METHOD3(set_mem, int)
METHOD1(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
commit 2b1428fd3e41cc7830ded0d057fdac0a27d4c5b3
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 21:22:20 2025 +0200
Add meaningful arguments
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 8ef760f72..37cb1ebda 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -150,14 +150,15 @@ class TestClass:
assert rig.lookup_mem_caps(0) is None
assert isinstance(rig.mem_count(), int)
assert rig.open() is None
- assert rig.passband_narrow(0) is None
- assert rig.passband_normal(0) is None
- assert rig.passband_wide(0) is None
+ assert rig.passband_narrow(Hamlib.RIG_MODE_CW) is None # FIXME should return passband
+ assert rig.passband_normal(Hamlib.RIG_MODE_CW) is None # FIXME should return passband
+ assert rig.passband_wide(Hamlib.RIG_MODE_CW) is None # FIXME should return passband
assert isinstance(rig.recv_dtmf(), str)
- assert isinstance(rig.recv_dtmf(0), str)
+ assert isinstance(rig.recv_dtmf(Hamlib.RIG_VFO_CURR), str)
assert rig.reset(Hamlib.RIG_RESET_NONE) is None
- assert rig.scan(0, 0) is None
- assert rig.scan(0, 0, 0) is None
+ channel = 0
+ assert rig.scan(Hamlib.RIG_SCAN_VFO, channel) is None
+ assert rig.scan(Hamlib.RIG_SCAN_VFO, channel, Hamlib.RIG_VFO_CURR) is None
assert rig.send_dtmf("*0123456789#ABCD") is None
assert rig.send_dtmf("*0123456789#ABCD", Hamlib.RIG_VFO_CURR) is None
assert rig.send_morse("73") is None
@@ -168,10 +169,12 @@ class TestClass:
option.i = 0
assert rig.set_ant(Hamlib.RIG_VFO_CURR, option) is None
assert rig.set_ant(Hamlib.RIG_VFO_CURR, option, RIG_ANT_1) is None
- assert rig.set_bank(0, 0) is None
+ bank = 0
+ assert rig.set_bank(bank) is None
+ assert rig.set_bank(bank, Hamlib.RIG_VFO_CURR) is None
channel = Hamlib.channel()
channel = Hamlib.channel(0)
- channel = Hamlib.channel(0, 0)
+ channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
assert rig.set_channel(channel) is None
assert rig.set_conf("", "") is None
assert rig.set_ctcss_sql(0, 0) is None
@@ -187,13 +190,15 @@ class TestClass:
assert rig.set_ext_level(level, value, Hamlib.RIG_VFO_CURR) is None
value = Hamlib.value_t()
assert rig.set_ext_parm(0, value) is None
- assert rig.set_freq(0, 0) is None
+ freq = 0
+ assert rig.set_freq(freq) is None
+ assert rig.set_freq(freq, Hamlib.RIG_VFO_CURR) is None
assert rig.set_func(0, 0, 0) is None
assert rig.set_level(0, 0, 0) is None
assert rig.set_mem(0, 0) is None
assert rig.set_mode(0) is None
assert rig.set_mode(0, 0) is None
- assert rig.set_mode(0, 0, 0) is None
+ 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
commit 8901b210ee0a9ff399904f1516350e65e2ed6de0
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 21:04:39 2025 +0200
Fix Rig.send_dtmf()
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 7547cd838..8ef760f72 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -158,7 +158,8 @@ class TestClass:
assert rig.reset(Hamlib.RIG_RESET_NONE) is None
assert rig.scan(0, 0) is None
assert rig.scan(0, 0, 0) is None
- assert rig.send_dtmf(0, "") is None
+ assert rig.send_dtmf("*0123456789#ABCD") is None
+ assert rig.send_dtmf("*0123456789#ABCD", Hamlib.RIG_VFO_CURR) is None
assert rig.send_morse("73") is None
assert rig.send_morse("73", Hamlib.RIG_VFO_CURR) is None
# FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
diff --git a/bindings/rig.swg b/bindings/rig.swg
index 096b75b0b..4fe50342f 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -385,7 +385,7 @@ typedef channel_t * const_channel_t_p;
METHOD2(set_ext_func, hamlib_token_t, int)
METHOD3(set_bank, int)
METHOD3(set_mem, int)
- METHOD3(send_dtmf, const_char_string)
+ METHOD1(send_dtmf, const_char_string)
METHOD1(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
METHOD2(scan, scan_t, int)
commit 13c2413bbaf3fb99c3448771b868ea3c5c032282
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 20:59:09 2025 +0200
Fix Rig.send_morse()
This is also swapping the arguments to make the vfo optional
like in other methods.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 80f37acd2..7547cd838 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -159,7 +159,8 @@ class TestClass:
assert rig.scan(0, 0) is None
assert rig.scan(0, 0, 0) is None
assert rig.send_dtmf(0, "") is None
- assert rig.send_morse(0, "") is None
+ assert rig.send_morse("73") is None
+ assert rig.send_morse("73", Hamlib.RIG_VFO_CURR) is None
# FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
RIG_ANT_1 = 1<<0
option = Hamlib.value_t()
diff --git a/bindings/python/test_startup.py b/bindings/python/test_startup.py
index e38cc355d..4620ce4dc 100755
--- a/bindings/python/test_startup.py
+++ b/bindings/python/test_startup.py
@@ -83,7 +83,7 @@ class TestClass:
#(freq, width, mode, split) = my_rig.get_vfo_info(Hamlib.RIG_VFO_A,freq,width,mode,split)
#print("Rig vfo_info:\t\tfreq=%s, mode=%s, width=%s, split=%s" % (freq, mode, width, split))
- assert my_rig.send_morse(Hamlib.RIG_VFO_A, "73") is None
+ assert my_rig.send_morse("73", Hamlib.RIG_VFO_A) is None
assert my_rig.close() is None
# Some static functions
diff --git a/bindings/rig.swg b/bindings/rig.swg
index f2ee04e53..096b75b0b 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -386,7 +386,7 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_bank, int)
METHOD3(set_mem, int)
METHOD3(send_dtmf, const_char_string)
- METHOD3(send_morse, const_char_string)
+ METHOD1(send_morse, const_char_string)
METHOD3(vfo_op, vfo_op_t)
METHOD2(scan, scan_t, int)
METHODSIMPLESET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
commit 25a2a4447f01eaaec83f5a95903f6e300ba0534b
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 19:28:20 2025 +0200
Fix Rig.get_ant() tests
The first argument is the antenna.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 1c3927cb0..80f37acd2 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -59,10 +59,13 @@ class TestClass:
assert rig.get_split_vfo() == [5000000, 1]
assert rig.get_split_vfo(Hamlib.RIG_VFO_CURR) == [5000000, 1]
- # FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
+ # FIXME should use a RIG_ANT_* constant but they aren't available in the bindings
+ RIG_ANT_1 = 1<<0
RIG_ANT_UNKNOWN = 1<<30
- assert rig.get_ant(Hamlib.RIG_VFO_A) == [RIG_ANT_UNKNOWN, RIG_ANT_UNKNOWN, Hamlib.RIG_VFO_A, 0]
- assert rig.get_ant(Hamlib.RIG_VFO_A, Hamlib.RIG_VFO_A) == [RIG_ANT_UNKNOWN, RIG_ANT_UNKNOWN, Hamlib.RIG_VFO_A, 0]
+ RIG_ANT_CURR = 1<<31
+ expected = [RIG_ANT_UNKNOWN, RIG_ANT_UNKNOWN, RIG_ANT_1, 0]
+ assert rig.get_ant(RIG_ANT_CURR) == expected
+ assert rig.get_ant(RIG_ANT_CURR, Hamlib.RIG_VFO_A) == expected
assert rig.close() is None
assert rig.state.comm_state == 0
-----------------------------------------------------------------------
Summary of changes:
bindings/python/test_rig.py | 109 ++++++++++++++++++++++++++------------------
bindings/rig.swg | 2 +-
2 files changed, 65 insertions(+), 46 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
