[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 05728f74ebbc1488a030d
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 05728f74ebbc1488a030dddeab9a49a36543b109
|
From: Michael B. <mdb...@us...> - 2021-01-20 16:47:16
|
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 05728f74ebbc1488a030dddeab9a49a36543b109 (commit)
via e32e47a858541bb7ac7d9eea66b3d178fc36e1e6 (commit)
via 0ad3c94e9bd9f7734809c2821e468201eda765fe (commit)
via 81cc189f5794d9d9bf4138a137e3c82741c3f72f (commit)
from 14251b237dde212c7e9bb2addd24b9e3672c4c47 (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 05728f74ebbc1488a030dddeab9a49a36543b109
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Jan 20 10:46:07 2021 -0600
Fix testrigcaps.c
diff --git a/tests/testrigcaps.c b/tests/testrigcaps.c
new file mode 100644
index 00000000..4a223461
--- /dev/null
+++ b/tests/testrigcaps.c
@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <hamlib/rig.h>
+
+int main()
+{
+ printf("Check rig_caps offsets\n");
+ printf("If changed can affect shared library API\n");
+ RIG *rig;
+ int retcode = 0;
+ rig_set_debug_level(RIG_DEBUG_NONE);
+ rig = rig_init(1);
+ void *p1 = &rig->state.rigport;
+ void *p2 = &rig->state.vfo_list;
+ unsigned long offset = p2 - p1;
+ printf("offset vfo_list=%ld\n", offset);
+ int expected = 13280;
+ if (offset != expected)
+ {
+ printf("offset of vfo_list has changed!!!\n");
+ printf("was %d, now %lu\n", expected, offset );
+ retcode = 1;
+ }
+
+ p2 = &rig->state.power_max;
+ offset = p2 - p1;
+ printf("offset power_max=%ld\n", offset);
+
+ expected = 13696;
+ if (offset != expected)
+ {
+ printf("offset of power_max has changed!!!\n");
+ printf("was %d, now %lu\n", expected, offset );
+ retcode = 1;
+ }
+
+ return retcode;
+}
commit e32e47a858541bb7ac7d9eea66b3d178fc36e1e6
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Jan 20 10:44:37 2021 -0600
Add testrigcaps to catch potential shared library problems
Add testrigopen to test time it takes to timeout when rig is powered off
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b63aef5..c6a9aa0b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum hamlibdatetime.h
bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld
-check_PROGRAMS = dumpmem testrig testtrn testbcd testfreq listrigs testloc rig_bench cachetest cachetest2
+check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench cachetest cachetest2
RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c sprintflst.c sprintflst.h uthash.h hamlibdatetime.h
ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c sprintflst.c sprintflst.h uthash.h hamlibdatetime.h
@@ -77,7 +77,7 @@ EXTRA_DIST = rigmatrix_head.html rig_split_lst.awk testctld.pl testrotctld.pl \
hamlibdatetime.h.in
# Support 'make check' target for simple tests
-check_SCRIPTS = testrig.sh testfreq.sh testbcd.sh testloc.sh
+check_SCRIPTS = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh
TESTS = $(check_SCRIPTS)
@@ -98,6 +98,10 @@ testloc.sh:
echo './testloc EM79UT96LW 5' > testloc.sh
chmod +x ./testloc.sh
+testrigcaps.sh:
+ echo './testrigcaps' > testrigcaps.sh
+ chmod +x ./testrigcaps.sh
+
# If we have a .git directory then we will generate the hamlibdate.h
# file and replace it if it is different. Fall back to a copy of a
# generic hamlibdatetime.h.in in the source tree. Build looks in build
commit 0ad3c94e9bd9f7734809c2821e468201eda765fe
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Jan 20 07:51:01 2021 -0600
Fix ft1000mp.c retry since retries are done in read_block now
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 2b41b2ca..c887ec00 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -222,7 +222,7 @@ const struct rig_caps ft1000mp_caps =
RIG_MODEL(RIG_MODEL_FT1000MP),
.model_name = "FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200731.0",
+ .version = "20210120.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -356,7 +356,7 @@ const struct rig_caps ft1000mpmkv_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKV),
.model_name = "MARK-V FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200731.0",
+ .version = "20210120.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -490,7 +490,7 @@ const struct rig_caps ft1000mpmkvfld_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD),
.model_name = "MARK-V Field FT-1000MP",
.mfg_name = "Yaesu",
- .version = "20200731.0",
+ .version = "20210120.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1528,7 +1528,9 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
p = (struct ft1000mp_priv_data *)rig->state.priv;
rig_s = &rig->state;
- do
+ // timeout retries are done in read_block now
+ // based on rig backed retry value
+// do
{
/* send UPDATE command to fetch data*/
ft1000mp_send_priv_cmd(rig, ci);
@@ -1538,9 +1540,10 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci,
if (n == -RIG_ETIMEOUT)
{
rig_debug(RIG_DEBUG_TRACE, "%s: Timeout retry count = %d\n", __func__, retry);
+ //rig_debug(RIG_DEBUG_TRACE, "%s: Timeout\n", __func__, retry);
}
}
- while (retry-- && n == -RIG_ETIMEOUT);
+// while (retry-- && n == -RIG_ETIMEOUT);
return n;
commit 81cc189f5794d9d9bf4138a137e3c82741c3f72f
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Jan 20 07:20:46 2021 -0600
Update trxmanager model name
diff --git a/rigs/dummy/trxmanager.c b/rigs/dummy/trxmanager.c
index 51fa9d0e..a5cbf2f4 100644
--- a/rigs/dummy/trxmanager.c
+++ b/rigs/dummy/trxmanager.c
@@ -117,7 +117,7 @@ struct trxmanager_priv_data
struct rig_caps trxmanager_caps =
{
RIG_MODEL(RIG_MODEL_TRXMANAGER_RIG),
- .model_name = "5.7.630+",
+ .model_name = "TRXManager 5.7.630+",
.mfg_name = "TRXManager",
.version = BACKEND_VER ".0",
.copyright = "LGPL",
-----------------------------------------------------------------------
Summary of changes:
rigs/dummy/trxmanager.c | 2 +-
rigs/yaesu/ft1000mp.c | 13 ++++++++-----
tests/Makefile.am | 8 ++++++--
tests/testrigcaps.c | 37 +++++++++++++++++++++++++++++++++++++
4 files changed, 52 insertions(+), 8 deletions(-)
create mode 100644 tests/testrigcaps.c
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
