[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 0d543f9483f348c1f6bc8
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 0d543f9483f348c1f6bc8ff0375034590cf9da85
|
From: n0nb <n0...@us...> - 2025-07-27 16:08:35
|
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 0d543f9483f348c1f6bc8ff0375034590cf9da85 (commit)
via bc25855f48edf631d7653345f0bb763759094ba5 (commit)
via df6ddedf63a65529b214e609510e055da127a949 (commit)
via f0efc558f6354a64fb22255a1979e58a68ff1e0f (commit)
from 119e0793739c772fcee2fbe7228c4b61afc279e1 (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 0d543f9483f348c1f6bc8ff0375034590cf9da85
Merge: 119e07937 bc25855f4
Author: Nate Bargmann <n0...@n0...>
Date: Sun Jul 27 10:54:55 2025 -0500
Merge GitHub PR #1815
commit bc25855f48edf631d7653345f0bb763759094ba5
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Jul 26 00:15:09 2025 +0200
Check split argument in dummy_get_split_mode() and fix the test
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 1c3927cb0..0ccc01097 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -51,13 +51,13 @@ 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]
+ 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]
# FIXME should use a RIG_ANT_* constant but it isn't available in the bindings
RIG_ANT_UNKNOWN = 1<<30
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index de1dae493..e25d0bbf3 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -1114,11 +1114,25 @@ static int dummy_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
rig_debug(RIG_DEBUG_VERBOSE, "%s: split=%d, vfo=%s, tx_vfo=%s\n",
__func__, split, rig_strvfo(vfo), rig_strvfo(tx_vfo));
+ switch (split)
+ {
+ case RIG_SPLIT_OFF:
+ priv->split = RIG_SPLIT_OFF;
+ break;
+
+ case RIG_SPLIT_ON:
+ priv->split = RIG_SPLIT_ON;
+ break;
+
+ default:
+ rig_debug(RIG_DEBUG_ERR, "%s: unsupported split %d", __func__, split);
+ RETURNFUNC(-RIG_EINVAL);
+ }
+
if (tx_vfo == RIG_VFO_NONE || tx_vfo == RIG_VFO_CURR) { tx_vfo = priv->curr_vfo; }
if (tx_vfo == RIG_VFO_CURR || tx_vfo == RIG_VFO_TX) { tx_vfo = vfo_fixup(rig, vfo, CACHE(rig)->split); }
- priv->split = split;
priv->tx_vfo = tx_vfo;
RETURNFUNC(RIG_OK);
commit df6ddedf63a65529b214e609510e055da127a949
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Fri Jul 25 23:52:02 2025 +0200
Use a define instead of a magic number
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index fc9f10571..de1dae493 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -197,7 +197,7 @@ static void init_chan(RIG *rig, vfo_t vfo, channel_t *chan)
chan->rit = 0;
chan->xit = 0;
chan->tuning_step = 0;
- chan->ant = 0;
+ chan->ant = RIG_ANT_NONE;
chan->funcs = (setting_t)0;
memset(chan->levels, 0, RIG_SETTING_MAX * sizeof(value_t));
commit f0efc558f6354a64fb22255a1979e58a68ff1e0f
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Jun 29 18:15:00 2025 +0200
Make Dummy Rig handle also RIG_ANT_5
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index a7006792f..fc9f10571 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -1823,6 +1823,7 @@ static int dummy_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
case RIG_ANT_2:
case RIG_ANT_3:
case RIG_ANT_4:
+ case RIG_ANT_5:
curr->ant = ant;
break;
@@ -1860,6 +1861,7 @@ static int dummy_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
case RIG_ANT_2:
case RIG_ANT_3:
case RIG_ANT_4:
+ case RIG_ANT_5:
*ant_curr = ant;
break;
@@ -2463,14 +2465,14 @@ struct rig_caps dummy_caps =
.agc_levels = { RIG_AGC_OFF, RIG_AGC_SUPERFAST, RIG_AGC_FAST, RIG_AGC_MEDIUM, RIG_AGC_SLOW, RIG_AGC_AUTO, RIG_AGC_USER },
.rx_range_list1 = { {
.startf = kHz(150), .endf = MHz(1500), .modes = DUMMY_MODES,
- .low_power = -1, .high_power = -1, DUMMY_VFOS, RIG_ANT_1 | RIG_ANT_2 | RIG_ANT_3 | RIG_ANT_4,
+ .low_power = -1, .high_power = -1, DUMMY_VFOS, RIG_ANT_1 | RIG_ANT_2 | RIG_ANT_3 | RIG_ANT_4 | RIG_ANT_5,
.label = "Dummy#1"
},
RIG_FRNG_END,
},
.tx_range_list1 = { {
.startf = kHz(150), .endf = MHz(1500), .modes = DUMMY_MODES,
- .low_power = W(5), .high_power = W(100), DUMMY_VFOS, RIG_ANT_1 | RIG_ANT_2 | RIG_ANT_3 | RIG_ANT_4,
+ .low_power = W(5), .high_power = W(100), DUMMY_VFOS, RIG_ANT_1 | RIG_ANT_2 | RIG_ANT_3 | RIG_ANT_4 | RIG_ANT_5,
.label = "Dummy#1"
},
RIG_FRNG_END,
-----------------------------------------------------------------------
Summary of changes:
bindings/python/test_rig.py | 14 +++++++-------
rigs/dummy/dummy.c | 24 ++++++++++++++++++++----
2 files changed, 27 insertions(+), 11 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
