Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 3fa91c8771981106539eb16e5b02212232793912
|
From: n0nb <n0...@us...> - 2025-08-19 13:10:14
|
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 3fa91c8771981106539eb16e5b02212232793912 (commit)
via 73a967e5696e0c5255394e57d85a2d32214b691d (commit)
via 6e3b8b223d086dac4c625536576dfef9b72f17b8 (commit)
via e3d1ed00b7018d938e69c23dc7bac3a669401508 (commit)
via 8f0c94dc773d7d3ae544d85ccff2247682362f4e (commit)
via 1aafbb3f2415f2e701440a988068ecbf2ffd63d0 (commit)
via 271129705aa123f2db5a6f71b617c80d7affbf71 (commit)
via c91c3feac0fd592f307f74c6c30080d8a2031b88 (commit)
via edda52b40ebb0824a844553fcf75fe830236afe4 (commit)
via dadd6e1495f2e0f22f59347337827f19ec7d6f8a (commit)
via 014b34e674b99ae7d3dcb221543267768541c4b0 (commit)
via 8dc20bb2705e8df9173e1419130ad02e390efa23 (commit)
via 26412650a66b33d329feb5c5235005eed383ff5c (commit)
via d4eee93c858c0fd13c5910e70504a1d9180a223e (commit)
via 53e27d6e8872a8754a33c87f0c07082481b095dc (commit)
via 8805748e748720356525206c15961707fa18a6ac (commit)
via 69a9f15e3e1fd645bd90b651f53acf24100a7694 (commit)
via 250d661a2a752d72249f3990a9936f4cb6c092e2 (commit)
via 6a83b0d0547fd0f0e115f3a3553faf061fa3666f (commit)
via 201b4544b7c0bea829a19b877fa4a7422c7c23b1 (commit)
via 897e59ef0e2e5876af44dc3ec0f8e8125bfa369e (commit)
via 3c7b3dafcf40e8ab27871e6a91242a48d4d072bc (commit)
via d4444d2247f4c2366981eebc9cb3a65305f4e034 (commit)
via 3c214ed676db6a110a41130278d2507d99524805 (commit)
via d8b02a73e1e7479e0cd3af09ae163cfc3399c045 (commit)
via 3e43b513d6d048513d621e09b862c9d2971d88eb (commit)
via b2828881b617986d33aa518459ff3b6451ba7415 (commit)
from afda578d45098e77fe05be2044598f94c5a278ec (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 3fa91c8771981106539eb16e5b02212232793912
Author: Nate Bargmann <n0...@n0...>
Date: Mon Aug 18 13:28:35 2025 -0500
Document fixing MinGW warnings and linker error
This commit has been left as documentation should these files be moved
to /doc or some such. However, never of these files are built or
distributed.
----------------
From example.c the following warning was generated by MinGW:
CC example.o
example.c: In function ‘main’:
example.c:93:32: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘rmode_t’ {aka ‘long long unsigned int’} [-Wformat=]
93 | printf("Current mode = 0x%lX = %s, width = %ld\n", mode, rig_strrmode(mode),
| ~~^ ~~~~
| | |
| long unsigned int rmode_t {aka long long unsigned int}
| %llX
The 'l' was added as suggested to the format specifier but that resulted
in the following warning from Linux:
CC example.o
../../hamlib/tests/example.c:93:57: warning: format specifies type 'unsigned long long' but the argument has type 'rmode_t' (aka 'unsigned long') [-Wformat]
printf("Current mode = 0x%llX = %s, width = %ld\n", mode, rig_strrmode(mode),
~~~~ ^~~~
%lX
CC rigctl-dumpcaps.o
1 warning generated.
So casting `mode` to `unsigned long long` quelled both warnings!
From testsecurity.c came this warning:
CC testsecurity-testsecurity.o
In file included from ../include/hamlib/rig.h:49,
from ../src/misc.h:26,
from testsecurity.c:29:
/usr/share/mingw-w64/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h [-Wcpp]
15 | #warning Please include winsock2.h before windows.h
| ^~~~~~~
Apparently winsock2.h being included through misc.h didn't work.
Finally, the Mingw linker gave the following error:
CCLD testsecurity.exe
/usr/bin/x86_64-w64-mingw32-ld: testsecurity-testsecurity.o: in function `main':
/home/nate/builds/hamlib-4.7~git/tests/testsecurity.c:97:(.text.startup+0x87): undefined reference to `AESStringCrypt'
/usr/bin/x86_64-w64-mingw32-ld: /home/nate/builds/hamlib-4.7~git/tests/testsecurity.c:116:(.text.startup+0x128): undefined reference to `AESStringDecrypt'
collect2: error: ld returned 1 exit status
Specifcally add the libsecurity.la file path as a specific library.
Even though the libhamlib.la seems to have the AESStringCrypt symbol
already.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78744bf2c..ab63d9d86 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,7 +57,9 @@ rigctlsync_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/security
if HAVE_LIBUSB
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
endif
-testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/security
+
+# Document building testsecurity
+### testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/security
rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
@@ -73,6 +75,9 @@ if HAVE_LIBUSB
rigtestlibusb_LDADD = $(LIBUSB_LIBS)
endif
+# Document linking testsecurity
+### testsecurity_LDADD = $(PTHREAD_LIBS) $(LDADD) $(top_builddir)/security/libsecurity.la
+
# Linker options
rigctl_LDFLAGS = $(WINEXELDFLAGS)
rigswr_LDFLAGS = $(WINEXELDFLAGS)
@@ -90,6 +95,8 @@ if HAVE_LIBUSB
rigtestlibusb_LDFLAGS = $(WINEXELDFLAGS)
endif
+# Document linking testsecurity with MinGW
+### testsecurity_LDFLAGS = $(WINEXELDFLAGS)
if HTML_MATRIX
EXTRA_PROGRAMS = rigmatrix
diff --git a/tests/example.c b/tests/example.c
index 2e5ea6b32..7ded7a202 100644
--- a/tests/example.c
+++ b/tests/example.c
@@ -90,7 +90,7 @@ int main()
if (status != RIG_OK) { printf("Get mode failed?? Err=%s\n", rigerror(status)); }
- printf("Current mode = 0x%lX = %s, width = %ld\n", mode, rig_strrmode(mode),
+ printf("Current mode = 0x%llX = %s, width = %ld\n", (unsigned long long)mode, rig_strrmode(mode),
width);
/* rig power output */
diff --git a/tests/testsecurity.c b/tests/testsecurity.c
index fe13b751b..415e3bf99 100644
--- a/tests/testsecurity.c
+++ b/tests/testsecurity.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <string.h>
#ifdef _WIN32
+#include <winsock2.h>
#include <windows.h>
//#include <Wincrypt.h>
#else
commit 73a967e5696e0c5255394e57d85a2d32214b691d
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Aug 17 12:08:23 2025 +0200
Remove the remaining files of the DejaGnu tests
The tests were disabled in commit cb1732fc2a355d21bbbfd82f299b066d49b8db1e.
diff --git a/tests/config/unix.exp b/tests/config/unix.exp
deleted file mode 100644
index ff023e709..000000000
--- a/tests/config/unix.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 1997 - 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# ham...@li...
-
-set RIGCTL "../rigctl"
-set verbose 0
-
-if ![info exists prompt] then {
- set prompt "Rig command: "
-}
-#
-# rigctl_version -- extract and print the version number of rigctl
-#
-
-proc rigctl_version {} {
- global RIGCTL
- global prompt
- set tmp [exec $RIGCTL --version]
- regexp "Hamlib version *(\[^\n\]*)\n.*" $tmp tmp version
- clone_output "[which $RIGCTL] version $version\n"
-}
-#
-# rigctl_load -- loads the program
-#
-proc rigctl_load { arg } {
- #
-}
-
-#
-# rigctl_exit -- quit and cleanup
-#
-proc rigctl_exit {} {
- send "quit\n"
-}
-
-#
-# rigctl_start -- start rigctl running
-#
-proc rigctl_start {} {
- global RIGCTL
- global prompt
- global spawn_id
- global verbose
-
- if { $verbose > 1 } {
- send_user "starting $RIGCTL\n"
- }
- spawn $RIGCTL
- expect {
- -re "No such file.*" { perror "Can't start $RIGCTL"; exit 1 }
- -re "$prompt$" { }
- #FIXME
- #-re "rig: dlsym\(initrigs_([^\)]*)\) failed.*" { perror "Can't find backend $expect_out(1,string)"; exit 1 }
- timeout { perror "Failed to spawn $RIGCTL (timeout)"; exit 1 }
- }
-}
-
-rigctl_start
-send "v\n"
-expect { -re ""}
-expect { -re "v*"}
-expect { -re "VFO:*"}
-expect { -re "Rig Command:"}
-#send "f\n"
-#expect { -re "Frequency:*"}
-#interact
-#send "m\n"
-#expect { -re "Mode:*"}
-#send "t\n"
-#expect { -re "PTT:*"}
-rigctl_exit
diff --git a/tests/rigctl.test/rigctl.exp b/tests/rigctl.test/rigctl.exp
deleted file mode 100644
index 8b13f2f57..000000000
--- a/tests/rigctl.test/rigctl.exp
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 1997 - 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# ham...@li...
-
-set timeout 3
-#
-# expectations that clean up in case of error. Note that '$test' is
-# a purely local variable.
-#
-# The first of these is used to match any bad responses, and resynchronise
-# things by finding a prompt. The second is a timeout error, and shouldn't
-# ever be triggered.
-#
-expect_after {
- -re "\[^\n\r\]*$prompt$" {
- fail "$test (bad match)"
- if { $verbose > 0 } {
- regexp ".*\r\n(\[^\r\n\]+)(\[\r\n\])+$prompt$" \
- $expect_out(buffer) "" output
- send_user "\tUnmatched output: \"$output\"\n"
- }
- }
- timeout {
- fail "$test (timeout)"
- }
-}
-#
-# Here are the tests
-#
-set test "help"
-send "?\n"
-expect {
- -re "Commands \\(may not be available for this rig\\):.*$prompt$" { pass "$test" }
-}
-
-set test "nocmd"
-send "\n"
-expect {
- -re "\\? for help, q to quit\\..*$prompt$" { pass "$test" }
-}
-
-set test "info"
-send "\\get_info\n"
-expect {
- -re "Info:.*$prompt$" { pass "$test" }
-}
diff --git a/tests/testbcd.test/testbcd.exp b/tests/testbcd.test/testbcd.exp
deleted file mode 100644
index 656bf6d35..000000000
--- a/tests/testbcd.test/testbcd.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 1997 - 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# ham...@li...
-
-set TESTBCD "$srcdir/testbcd"
-
-#
-# Here are the tests
-#
-
-# BCD: 44,34,33,22,12
-# BCD: 12,22,33,34,44
-proc test_bcd { test freq digits bcdle bcdbe } {
-
- global TESTBCD
- set tmp [exec $TESTBCD $freq $digits]
-
- set pat ".*Little Endian mode\nFrequency: $freq\nBCD: $bcdle\nResult after recoding: $freq\n\nBig Endian mode\nFrequency: $freq\nBCD: $bcdbe\nResult after recoding: $freq$"
- if [regexp $pat $tmp] {
- pass "$test"
- } else {
- clone_output "Expected le: $bcdle, be: $bcdbe, got:\n$tmp"
- fail "$test"
- }
-}
-
-test_bcd "10/10 digits" 1222333444 10 "44,34,33,22,12" "12,22,33,34,44"
-test_bcd "9/10 digits" 999666333 10 "33,63,66,99,09" "09,99,66,63,33"
-test_bcd "8/10 digits" 87666333 10 "33,63,66,87,00" "00,87,66,63,33"
-test_bcd "1/10 digit" 1 10 "01,00,00,00,00" "00,00,00,00,01"
-
-# note the 10th digit which is undefined
-test_bcd "9/9 digits" 999666333 9 "33,63,66,99,.9" "99,96,66,33,3."
-test_bcd "8/9 digits" 87666333 9 "33,63,66,87,.0" "08,76,66,33,3."
-test_bcd "1/9 digit" 1 9 "01,00,00,00,.0" "00,00,00,00,1."
-
diff --git a/tests/testfreq.test/testfreq.exp b/tests/testfreq.test/testfreq.exp
deleted file mode 100644
index a636c3598..000000000
--- a/tests/testfreq.test/testfreq.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 1997 - 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# ham...@li...
-
-set TESTFREQ "$srcdir/testfreq"
-
-#
-# Here are the tests
-#
-
-proc test_freq { test } {
-
- global TESTFREQ
- set tmp [exec $TESTFREQ]
-
- set pat ".*GHz.2. = 2000000000\nGHz.4. = 4000000000\nGHz.5. = 5000000000\nGHz.1.3. = 1300000000\nGHz.1.234567890. = 1234567890\nGHz.123.456789012. = 123456789012$"
- if [regexp $pat $tmp] {
- pass "$test"
- } else {
- clone_output "Expected GHz holding on >32bits, got:\n$tmp"
- fail "$test"
- puts $pat
- }
-}
-
-test_freq ">32bit freq's"
-
diff --git a/tests/testloc.test/testloc.exp b/tests/testloc.test/testloc.exp
deleted file mode 100644
index 763e037d5..000000000
--- a/tests/testloc.test/testloc.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 1997 - 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# ham...@li...
-
-set TESTLOC "$srcdir/testloc"
-
-#
-# Here are the tests
-#
-
-# TODO: upcase locator
-proc test_loc1 { test loc } {
-
- global TESTLOC
- set tmp [exec $TESTLOC $loc]
-
- set pat "Locator1: $loc\n.*Recoded: $loc$"
- if [regexp $pat $tmp] {
- pass "$test"
- } else {
- clone_output "Expected locator: $loc, got:\n$tmp"
- fail "$test"
- }
-}
-
-test_loc1 "Simple recorded loc" IN98EC
-test_loc1 "Simple recorded loc" EM19OV
-test_loc1 "Simple recorded loc" DM33DX
-test_loc1 "Simple recorded loc" IO93LA
-test_loc1 "Simple recorded loc" IO93MA
-test_loc1 "Simple recorded loc" IO93NA
-
commit 6e3b8b223d086dac4c625536576dfef9b72f17b8
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Aug 17 09:44:35 2025 +0200
Remove the perl/ subdirectory
It breaks "make dist", it was deprecated in favor of SWIG in
commit 59b81dfa183566a1d507621cc9bca0cf774eb3dc and if only
the contained some Makefiles.
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
deleted file mode 100644
index b7f6e06b0..000000000
--- a/perl/Makefile.PL
+++ /dev/null
@@ -1,19 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
- 'NAME' => 'Hamlib',
- 'VERSION_FROM' => 'Hamlib.pm', # finds $VERSION
- 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1
- ($] >= 5.005 ? ## Add these new keywords supported since 5.005
- (ABSTRACT_FROM => 'Hamlib.pm', # retrieve abstract from module
- AUTHOR => 'S. Fillod <fi...@us...>') : ()),
- # should use libtool somehow. Otherwise try -Wl,--rpath
- #'LIBS' => ['-L../../src/.libs -lhamlib'],
- 'DEFINE' => '',
- #'INC' => '-I.',
- 'dist' => {'COMPRESS'=>'gzip -9f', 'SUFFIX' => 'gz',
- 'ZIP'=>'/usr/bin/zip','ZIPFLAGS'=>'-rl'},
- # Un-comment this if you add C files to link with later:
- # 'OBJECT' => '$(O_FILES)', # link all the C files too
-);
diff --git a/perl/Makefile.am b/perl/Makefile.am
deleted file mode 100644
index f0980b29d..000000000
--- a/perl/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# note: VPATH building does not work yet
-
-Hamlib-pl.mk: $(top_srcdir)/perl/Makefile.PL
- cp -u $(top_srcdir)/perl/{Changes,MANIFEST,README.md,Hamlib.pm,Hamlib.xs,Makefile.PL,test.pl,typemap} . 2> /dev/null || exit 0
- perl Makefile.PL MAKEFILE=Hamlib-pl.mk INST_MAN3DIR=$(mandir) \
- LIB=$(libdir) CCFLAGS=$(CFLAGS) INC="$(INCLUDES)" \
- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
-
-all: Hamlib-pl.mk
- make -f Hamlib-pl.mk
-
-test: all
- make -f Hamlib-pl.mk test
-
-clean: Hamlib-pl.mk
- make -f Hamlib-pl.mk clean
-
-distclean: Hamlib-pl.mk
- make -f Hamlib-pl.mk distclean
-
-distcheck: Hamlib-pl.mk
- make -f Hamlib-pl.mk distcheck
-
-install: Hamlib-pl.mk
- make -f Hamlib-pl.mk install
-
-EXTRA_DIST = Changes MANIFEST README.md Hamlib.pm Hamlib.xs Makefile.PL \
- test.pl typemap
-
commit e3d1ed00b7018d938e69c23dc7bac3a669401508
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Aug 17 09:20:16 2025 +0200
Split and sort the list of DIST_SUBDIRS
diff --git a/Makefile.am b/Makefile.am
index f1eac5f41..9a84401b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,10 +33,24 @@ SUBDIRS = macros include lib security \
## Static list of distributed directories.
DIST_SUBDIRS = \
+ $(AMP_BACKEND_LIST) \
+ $(BACKEND_LIST) \
+ $(RIG_BACKEND_LIST) \
$(RIG_BACKEND_OPTIONAL_LIST) \
+ $(ROT_BACKEND_LIST) \
$(ROT_BACKEND_OPTIONAL_LIST) \
- macros include lib src c++ bindings tests doc android scripts simulators\
- security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
+ android \
+ bindings \
+ c++ \
+ doc \
+ include \
+ lib \
+ macros \
+ scripts \
+ security \
+ simulators \
+ src \
+ tests
# Install any third party macros into our tree for distribution
ACLOCAL_AMFLAGS = -I macros --install
commit 8f0c94dc773d7d3ae544d85ccff2247682362f4e
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:43:49 2025 +0200
[simulators] Fix compiler warning
Adds the same code used in other simulators.
Fixes:
simft897.c:26:9: warning: variable ‘n’ set but not used [-Wunused-but-set-variable]
diff --git a/simulators/simft897.c b/simulators/simft897.c
index 0af8f83c8..fdf855bfd 100644
--- a/simulators/simft897.c
+++ b/simulators/simft897.c
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
{
printf("Not 5 bytes? bytes=%d\n", bytes);
}
+ n = 0;
switch (buf[4])
{
@@ -104,6 +105,7 @@ int main(int argc, char *argv[])
default: printf("Unknown cmd=%02x\n", buf[4]);
}
+ if (n < 0) {printf("Write failed - n = %d\n", n); }
}
return 0;
commit 1aafbb3f2415f2e701440a988068ecbf2ffd63d0
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:42:35 2025 +0200
[simulators] Add missing files to check_PROGRAMS
diff --git a/simulators/.gitignore b/simulators/.gitignore
index 58fab97e8..bdef75281 100644
--- a/simulators/.gitignore
+++ b/simulators/.gitignore
@@ -7,9 +7,11 @@ simft1000
simft450
simft710
simft736
+simft747gx
simft817
simft818
simft847
+simft897
simft990
simft991
simftdx101
diff --git a/simulators/Makefile.am b/simulators/Makefile.am
index 8776b4273..2dd759f64 100644
--- a/simulators/Makefile.am
+++ b/simulators/Makefile.am
@@ -18,9 +18,11 @@ check_PROGRAMS = \
simft450 \
simft710 \
simft736 \
+ simft747gx \
simft817 \
simft818 \
simft847 \
+ simft897 \
simft990 \
simft991 \
simftdx101 \
commit 271129705aa123f2db5a6f71b617c80d7affbf71
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:39:40 2025 +0200
[simulators] Split and sort the list of check_PROGRAMS
diff --git a/simulators/Makefile.am b/simulators/Makefile.am
index 003e50e79..8776b4273 100644
--- a/simulators/Makefile.am
+++ b/simulators/Makefile.am
@@ -8,7 +8,65 @@ DISTCLEANFILES =
bin_PROGRAMS =
-check_PROGRAMS = simelecraft simicgeneric simkenwood simyaesu simic9100 simic9700 simft991 simftdx1200 simftdx3000 simjupiter simpowersdr simid5100 simft736 simftdx5000 simtmd700 simrotorez simspid simft817 simts590 simft847 simic7300 simic7000 simic7100 simic7200 simatd578 simic905 simts450 simic7600 simic7610 simic705 simts950 simts990 simic7851 simftdx101 simxiegug90 simqrplabs simft818 simic275 simtrusdx simft1000 simtmd710 simts890 simxiegux108g simxiegux6100 simic910 simft450 simelecraftk4 simmicom simflex simft710 simic2730 simorion simpmr171 simic7700 simft990 simpstrotator simeasycomm simicr8600
+check_PROGRAMS = \
+ simatd578 \
+ simeasycomm \
+ simelecraft \
+ simelecraftk4 \
+ simflex \
+ simft1000 \
+ simft450 \
+ simft710 \
+ simft736 \
+ simft817 \
+ simft818 \
+ simft847 \
+ simft990 \
+ simft991 \
+ simftdx101 \
+ simftdx1200 \
+ simftdx3000 \
+ simftdx5000 \
+ simic2730 \
+ simic275 \
+ simic7000 \
+ simic705 \
+ simic7100 \
+ simic7200 \
+ simic7300 \
+ simic7600 \
+ simic7610 \
+ simic7700 \
+ simic7851 \
+ simic905 \
+ simic910 \
+ simic9100 \
+ simic9700 \
+ simicgeneric \
+ simicr8600 \
+ simid5100 \
+ simjupiter \
+ simkenwood \
+ simmicom \
+ simorion \
+ simpmr171 \
+ simpowersdr \
+ simpstrotator \
+ simqrplabs \
+ simrotorez \
+ simspid \
+ simtmd700 \
+ simtmd710 \
+ simtrusdx \
+ simts450 \
+ simts590 \
+ simts890 \
+ simts950 \
+ simts990 \
+ simxiegug90 \
+ simxiegux108g \
+ simxiegux6100 \
+ simyaesu
# include generated include files ahead of any in sources
#rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS)
commit c91c3feac0fd592f307f74c6c30080d8a2031b88
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:26:21 2025 +0200
[tests] Make testnet.c build
diff --git a/tests/testnet.c b/tests/testnet.c
index 1d1f1f45d..84411446a 100644
--- a/tests/testnet.c
+++ b/tests/testnet.c
@@ -9,9 +9,7 @@
#include <sys/types.h>
#include <signal.h>
-#define HAVE_NETINET_IN_H
-#define HAVE_NETDB_H
-#define HAVE_ARPA_INET_H
+#include "config.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
@@ -25,6 +23,8 @@
# include <arpa/inet.h>
#endif
+#include "../src/misc.h"
+
static int rig_network_addr(char *hoststr, char *portstr)
{
@@ -73,11 +73,11 @@ static int rig_network_addr(char *hoststr, char *portstr)
return 0;
}
-static int test_host(char *hoststr, char host[256], char port[6])
+static int test_host(char *hoststr, char *host, char *port)
{
int status;
char host2[256], port2[6];
- status = parse_hoststr(hoststr, host2, port2);
+ status = parse_hoststr(hoststr, strlen(hoststr), host2, port2);
printf("---------------------\n");
commit edda52b40ebb0824a844553fcf75fe830236afe4
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:11:27 2025 +0200
[tests] Fix search path for includes
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2dc77d3b..78744bf2c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,7 +57,7 @@ rigctlsync_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/security
if HAVE_LIBUSB
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
endif
-#testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
+testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/security
rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
commit dadd6e1495f2e0f22f59347337827f19ec7d6f8a
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:01:45 2025 +0200
[tests] Set return codes in case of success/failure of the tests
diff --git a/tests/testsecurity.c b/tests/testsecurity.c
index a306b2381..fe13b751b 100644
--- a/tests/testsecurity.c
+++ b/tests/testsecurity.c
@@ -106,6 +106,7 @@ int main()
if (ciphertext_length == AESSTRINGCRYPT_ERROR)
{
printf("Error encrypting the string\n");
+ return 1;
}
printf("Ciphertext length: %d\n", ciphertext_length);
@@ -120,7 +121,10 @@ int main()
if (plaintext_length == AESSTRINGCRYPT_ERROR)
{
printf("Error decrypting the string\n");
+ return 1;
}
printf("Decrypted plaintext length: %d, %s\n", plaintext_length, plaintext);
+
+ return 0;
}
commit 014b34e674b99ae7d3dcb221543267768541c4b0
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 22:00:59 2025 +0200
[tests] Convert line endings from CR LF to LF
diff --git a/tests/testsecurity.c b/tests/testsecurity.c
index 4913fc1a0..a306b2381 100644
--- a/tests/testsecurity.c
+++ b/tests/testsecurity.c
@@ -1,126 +1,126 @@
-/* Borrowed for Hamlib from:
- * String Crypt Test (Linux)
- * Copyright (C) 2012, 2015
- *
- * Author: Paul E. Jones <pa...@pa...>
- *
- * This software is licensed as "freeware." Permission to distribute
- * this software in source and binary forms is hereby granted without a
- * fee. THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING FROM
- * THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING,
- * BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE.
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-//#include <Wincrypt.h>
-#else
-#include <unistd.h>
-#endif
-
-#include "AESStringCrypt.h"
-#include "password.h"
-#include "../src/misc.h"
-
-#if defined(_WIN32)
-// gmtime_r can be defined by mingw
-#ifndef gmtime_r
-static struct tm *gmtime_r(const time_t *t, struct tm *r)
-{
- // gmtime is threadsafe in windows because it uses TLS
- const struct tm *theTm = gmtime(t);
-
- if (theTm)
- {
- *r = *theTm;
- return r;
- }
- else
- {
- return 0;
- }
-}
-#endif // gmtime_r
-#endif // _WIN32
-
-// using tv_usec with a sleep gives a fairly good random number
-static int my_rand(int max)
-{
- time_t t;
- struct timeval tv;
- struct tm result;
-
- t = time(NULL);
- gmtime_r(&t, &result);
-
- gettimeofday(&tv, NULL);
- hl_usleep(100);
- int val = tv.tv_usec % max;
- return val;
-}
-
-void rig_make_key(char key[33])
-{
- const char *all =
- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123467890!@#$%^&*()_=~<>/?";
- int max = strlen(all);
- int i;
-
- for (i = 0; i < 32; ++i)
- {
- key[i] = all[my_rand(max)];
- }
-
- key[32] = 0;
-}
-
-int main()
-{
- char key1[33];
- char key2[33];
- char plaintext[33];
- unsigned char ciphertext[1024];
- int ciphertext_length;
- int plaintext_length;
- memset(ciphertext, 0, sizeof(ciphertext));
- rig_make_key(key1);
- rig_make_key(key2);
- printf("key1=%s\n", key1);
- printf("key2=%s\n", key2);
- ciphertext_length = AESStringCrypt((unsigned char *) key1,
- strlen(key1),
- (unsigned char *) key2,
- strlen(key2),
- (unsigned char *) ciphertext);
-
- for (int i = 0; i < ciphertext_length; ++i) { printf("%02x", ciphertext[i]); }
-
- printf("\n");
-
- if (ciphertext_length == AESSTRINGCRYPT_ERROR)
- {
- printf("Error encrypting the string\n");
- }
-
- printf("Ciphertext length: %d\n", ciphertext_length);
- memset(plaintext, 0, sizeof(plaintext));
- printf("Decrypting...\n");
- plaintext_length = AESStringDecrypt((unsigned char *) key1,
- strlen(key1),
- (unsigned char *) ciphertext,
- ciphertext_length,
- (unsigned char *) plaintext);
-
- if (plaintext_length == AESSTRINGCRYPT_ERROR)
- {
- printf("Error decrypting the string\n");
- }
-
- printf("Decrypted plaintext length: %d, %s\n", plaintext_length, plaintext);
-}
+/* Borrowed for Hamlib from:
+ * String Crypt Test (Linux)
+ * Copyright (C) 2012, 2015
+ *
+ * Author: Paul E. Jones <pa...@pa...>
+ *
+ * This software is licensed as "freeware." Permission to distribute
+ * this software in source and binary forms is hereby granted without a
+ * fee. THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING FROM
+ * THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING,
+ * BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+//#include <Wincrypt.h>
+#else
+#include <unistd.h>
+#endif
+
+#include "AESStringCrypt.h"
+#include "password.h"
+#include "../src/misc.h"
+
+#if defined(_WIN32)
+// gmtime_r can be defined by mingw
+#ifndef gmtime_r
+static struct tm *gmtime_r(const time_t *t, struct tm *r)
+{
+ // gmtime is threadsafe in windows because it uses TLS
+ const struct tm *theTm = gmtime(t);
+
+ if (theTm)
+ {
+ *r = *theTm;
+ return r;
+ }
+ else
+ {
+ return 0;
+ }
+}
+#endif // gmtime_r
+#endif // _WIN32
+
+// using tv_usec with a sleep gives a fairly good random number
+static int my_rand(int max)
+{
+ time_t t;
+ struct timeval tv;
+ struct tm result;
+
+ t = time(NULL);
+ gmtime_r(&t, &result);
+
+ gettimeofday(&tv, NULL);
+ hl_usleep(100);
+ int val = tv.tv_usec % max;
+ return val;
+}
+
+void rig_make_key(char key[33])
+{
+ const char *all =
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123467890!@#$%^&*()_=~<>/?";
+ int max = strlen(all);
+ int i;
+
+ for (i = 0; i < 32; ++i)
+ {
+ key[i] = all[my_rand(max)];
+ }
+
+ key[32] = 0;
+}
+
+int main()
+{
+ char key1[33];
+ char key2[33];
+ char plaintext[33];
+ unsigned char ciphertext[1024];
+ int ciphertext_length;
+ int plaintext_length;
+ memset(ciphertext, 0, sizeof(ciphertext));
+ rig_make_key(key1);
+ rig_make_key(key2);
+ printf("key1=%s\n", key1);
+ printf("key2=%s\n", key2);
+ ciphertext_length = AESStringCrypt((unsigned char *) key1,
+ strlen(key1),
+ (unsigned char *) key2,
+ strlen(key2),
+ (unsigned char *) ciphertext);
+
+ for (int i = 0; i < ciphertext_length; ++i) { printf("%02x", ciphertext[i]); }
+
+ printf("\n");
+
+ if (ciphertext_length == AESSTRINGCRYPT_ERROR)
+ {
+ printf("Error encrypting the string\n");
+ }
+
+ printf("Ciphertext length: %d\n", ciphertext_length);
+ memset(plaintext, 0, sizeof(plaintext));
+ printf("Decrypting...\n");
+ plaintext_length = AESStringDecrypt((unsigned char *) key1,
+ strlen(key1),
+ (unsigned char *) ciphertext,
+ ciphertext_length,
+ (unsigned char *) plaintext);
+
+ if (plaintext_length == AESSTRINGCRYPT_ERROR)
+ {
+ printf("Error decrypting the string\n");
+ }
+
+ printf("Decrypted plaintext length: %d, %s\n", plaintext_length, plaintext);
+}
commit 8dc20bb2705e8df9173e1419130ad02e390efa23
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 21:23:44 2025 +0200
[tests] Remove non-working duplicated code
It is almost an exact copy of testrigopen 1 line different and
without includes so it's not compiling.
diff --git a/tests/callback.c b/tests/callback.c
deleted file mode 100644
index dfa1f5b34..000000000
--- a/tests/callback.c
+++ /dev/null
@@ -1,42 +0,0 @@
-int callback(const struct rig_caps *caps, rig_ptr_t rigp)
-{
- RIG *rig = (RIG *) rigp;
-
- rig = rig_init(caps->rig_model);
-
- if (!rig)
- {
- fprintf(stderr, "Unknown rig num: %u\n", caps->rig_model);
- fprintf(stderr, "Please check riglist.h\n");
- exit(1); /* whoops! something went wrong (mem alloc?) */
- }
-
- const char *port = "/dev/pts/3";
- strcpy(RIGPORT(rig)->pathname, port);
-
- printf("%20s:", caps->model_name);
- fflush(stdout);
- struct timeval start, end;
- gettimeofday(&start, NULL);
- rig_open(rig);
- gettimeofday(&end, NULL);
- double dstart = start.tv_sec + start.tv_usec / 1e6;
- double dend = end.tv_sec + end.tv_usec / (double)1e6;
- printf(" %.1f\n", dend - dstart);
-
- rig_close(rig); /* close port */
- rig_cleanup(rig); /* if you care about memory */
- return 1;
-}
-
-int main(int argc, char *argv[])
-{
- RIG rig;
- printf("testing rig timeouts when rig powered off\n");
-
- /* Turn off backend debugging output */
- rig_set_debug_level(RIG_DEBUG_NONE);
- rig_load_all_backends();
- rig_list_foreach(callback, &rig);
- return 0;
-}
commit 26412650a66b33d329feb5c5235005eed383ff5c
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 15:26:36 2025 +0200
[tests] Add other existing test scripts
Adds: amptest.sh and testcaps.sh
Doesn't add cachetest.sh because it needs 2 instances of rigctld running.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3315cb0d2..f2dc77d3b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -115,7 +115,8 @@ EXTRA_DIST = \
testrotctld.pl
# Support 'make check' target for simple tests
-check_SCRIPTS = test2038.sh testbcd.sh testcache.sh testcookie.sh testfreq.sh testgrid.sh testloc.sh testrig.sh testrigcaps.sh
+# Omitting cachetest.sh because it needs 2 instances of rigctld running
+check_SCRIPTS = amptest.sh test2038.sh testbcd.sh testcache.sh testcaps.sh testcookie.sh testfreq.sh testgrid.sh testloc.sh testrig.sh testrigcaps.sh
TESTS = $(check_SCRIPTS)
commit d4eee93c858c0fd13c5910e70504a1d9180a223e
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 17:56:27 2025 +0200
[tests] Add missing files to EXTRA_DIST
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 40ad3226e..3315cb0d2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -104,8 +104,13 @@ endif
EXTRA_DIST = \
+ Android.mk \
+ amptest.sh \
+ cachetest.sh \
+ hamlib_tuner_control \
rig_split_lst.awk \
rigmatrix_head.html \
+ testcaps.sh \
testctld.pl \
testrotctld.pl
commit 53e27d6e8872a8754a33c87f0c07082481b095dc
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 17:47:22 2025 +0200
[tests] Split and sort the list of EXTRA_DIST files
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5418dc41d..40ad3226e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,7 +103,11 @@ rigmatrix.html: rigmatrix_head.html rigmatrix listrigs
endif
-EXTRA_DIST = rigmatrix_head.html rig_split_lst.awk testctld.pl testrotctld.pl
+EXTRA_DIST = \
+ rig_split_lst.awk \
+ rigmatrix_head.html \
+ testctld.pl \
+ testrotctld.pl
# Support 'make check' target for simple tests
check_SCRIPTS = test2038.sh testbcd.sh testcache.sh testcookie.sh testfreq.sh testgrid.sh testloc.sh testrig.sh testrigcaps.sh
commit 8805748e748720356525206c15961707fa18a6ac
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 16:04:29 2025 +0200
[simulators] Add missing files to EXTRA_DIST
diff --git a/simulators/Makefile.am b/simulators/Makefile.am
index b9d58619e..003e50e79 100644
--- a/simulators/Makefile.am
+++ b/simulators/Makefile.am
@@ -32,7 +32,7 @@ simkenwood_LDFLAGS = $(WINEXELDFLAGS)
simyaesu_LDFLAGS = $(WINEXELDFLAGS)
simid5100_LDFLAGS = $(WINEXELDFLAGS)
-EXTRA_DIST = sim.h
+EXTRA_DIST = sim.h simft990.dat
# Support 'make check' target for simple tests
#check_SCRIPTS =
commit 69a9f15e3e1fd645bd90b651f53acf24100a7694
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 16:00:44 2025 +0200
[security] Add missing files to EXTRA_DIST
diff --git a/security/Makefile.am b/security/Makefile.am
index f0ca51ceb..18f23a5a8 100644
--- a/security/Makefile.am
+++ b/security/Makefile.am
@@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I.
-EXTRA_DIST = sctest.c
+EXTRA_DIST = Android.mk sctest.c
noinst_LTLIBRARIES = libsecurity.la
commit 250d661a2a752d72249f3990a9936f4cb6c092e2
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 15:21:04 2025 +0200
[rigs] Remove uneeded EXTRA_DIST files
diff --git a/rigs/kenwood/Makefile.am b/rigs/kenwood/Makefile.am
index 83a41adb5..c9fa89158 100644
--- a/rigs/kenwood/Makefile.am
+++ b/rigs/kenwood/Makefile.am
@@ -14,4 +14,4 @@ KENWOODSRC = kenwood.c kenwood.h th.c th.h ic10.c ic10.h elecraft.c elecraft.h \
noinst_LTLIBRARIES = libhamlib-kenwood.la
libhamlib_kenwood_la_SOURCES = $(TSSRC) $(THSRC) $(IC10SRC) $(KENWOODSRC)
-EXTRA_DIST = README.kenwood README.k2 README.k3 README.flex Android.mk
+EXTRA_DIST = Android.mk
diff --git a/rigs/yaesu/Makefile.am b/rigs/yaesu/Makefile.am
index c1bdb576d..dc3dc51eb 100644
--- a/rigs/yaesu/Makefile.am
+++ b/rigs/yaesu/Makefile.am
@@ -17,4 +17,4 @@ NEWCATSRC = newcat.c newcat.h ft450.c ft450.h ft950.c ft950.h ft991.c ft991.h \
noinst_LTLIBRARIES = libhamlib-yaesu.la
libhamlib_yaesu_la_SOURCES = yaesu.c yaesu.h level_gran_yaesu.h $(YAESUSRC) $(NEWCATSRC)
-EXTRA_DIST = README.ft890 README.ft920 Android.mk
+EXTRA_DIST = Android.mk
commit 6a83b0d0547fd0f0e115f3a3553faf061fa3666f
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 13:41:34 2025 +0200
[doc] Split and sort the list of EXTRA_DIST files
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26e791e5a..9b1081ec8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,9 @@
-EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html hamlib.png
+EXTRA_DIST = \
+ footer.html \
+ hamlib.cfg \
+ hamlib.css \
+ hamlib.png \
+ index.doxygen
dist_man_MANS = man1/ampctl.1 man1/ampctld.1 \
man1/rigctl.1 man1/rigctld.1 man1/rigmem.1 man1/rigsmtr.1 \
commit 201b4544b7c0bea829a19b877fa4a7422c7c23b1
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 16 12:03:56 2025 +0200
Split and sort the list of EXTRA_DIST files
diff --git a/Makefile.am b/Makefile.am
index ff3c0e6d8..f1eac5f41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,18 @@ aclocal_DATA = hamlib.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = hamlib.pc
-EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.md README.developer \
- README.betatester README.freqranges README.multicast README.osx \
- Android.mk
+EXTRA_DIST = \
+ Android.mk \
+ README.betatester \
+ LICENSE \
+ PLAN \
+ README.developer \
+ README.freqranges \
+ README.md \
+ README.multicast \
+ README.osx \
+ hamlib.m4 \
+ hamlib.pc.in
doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \
README.md README.betatester README.developer
commit 897e59ef0e2e5876af44dc3ec0f8e8125bfa369e
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Tue Aug 12 10:02:03 2025 +0200
Fix comment to be relevant to the parm
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index d56d0ebbd..902bb683c 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -1187,7 +1187,7 @@ enum rig_parm_e {
RIG_PARM_SCREENSAVER = (1 << 8), /*!< \c SCREENSAVER -- rig specific timeouts */
RIG_PARM_AFIF = (1 << 9), /*!< \c AFIF for USB -- 0=AF audio, 1=IF audio -- see IC-7300/9700/705 */
RIG_PARM_BANDSELECT = (1 << 10), /*!< \c BANDSELECT -- e.g. BAND160M, BAND80M, BAND70CM, BAND2CM */
- RIG_PARM_KEYERTYPE = (1 << 11), /*!< \c KEYERTYPE -- 0,1,2,4 or STRAIGHT BUG PADDLE UNKNOWN */
+ RIG_PARM_KEYERTYPE = (1 << 11), /*!< \c KEYERTYPE -- Has multiple Morse keyer types, see #rig_keyertype_e */
RIG_PARM_AFIF_LAN = (1 << 12), /*!< \c AFIF for LAN -- 0=AF audio , 1=IF audio -- see IC-9700 */
RIG_PARM_AFIF_WLAN = (1 << 13), /*!< \c AFIF_WLAN -- 0=AF audio, 1=IF audio -- see IC-705 */
RIG_PARM_AFIF_ACC = (1 << 14) /*!< \c AFIF_ACC -- 0=AF audio, 1=IF audio -- see IC-9700 */
commit 3c7b3dafcf40e8ab27871e6a91242a48d4d072bc
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 13:10:00 2025 +0200
Read the frequency just set and fix typos
Since ampctl is using the dummy driver, the status is reset at
every run and it can't read the value set during the previous run.
diff --git a/tests/amptest.sh b/tests/amptest.sh
index 30601d779..196826c0b 100755
--- a/tests/amptest.sh
+++ b/tests/amptest.sh
@@ -11,12 +11,11 @@
./ampctl l PWRFORWARD l PWRFORWARD
./ampctl l PWRREFLECTED l PWRREFLECTED
./ampctl l PWRPEAK l PWRPEAK
-# Powerstat 0=Off, 1=On, 2=Standbyd, 4=Operate, 8=Unknown
+# Powerstat 0=Off, 1=On, 2=Standby, 4=Operate, 8=Unknown
./ampctl \set_powerstat 0
./ampctl \set_powerstat 1
./ampctl \set_powerstat 2
./ampctl \set_powerstat 4
./ampctl \set_powerstat 8
-# Sets/reads tuner frequenchy
-./ampctl F 14074000
-./ampctl f
+# Sets/reads tuner frequency
+./ampctl F 14074000 f
commit d4444d2247f4c2366981eebc9cb3a65305f4e034
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 13:08:30 2025 +0200
Modifiy amptest.sh to run ampctl from the build directory
diff --git a/tests/amptest.sh b/tests/amptest.sh
index 14c7cb748..30601d779 100755
--- a/tests/amptest.sh
+++ b/tests/amptest.sh
@@ -1,22 +1,22 @@
#!/bin/sh
# for the dummy amp values toggle between two likely values one each call
# Note FAULT is a string return
-ampctl l FAULT l FAULT
+./ampctl l FAULT l FAULT
# Note SWR is a float return
-ampctl l SWR l SWR
+./ampctl l SWR l SWR
# All other values are integer
-ampctl l NH l NH
-ampctl l PF l PF
-ampctl l PWRINPUT l PWRINPUT
-ampctl l PWRFORWARD l PWRFORWARD
-ampctl l PWRREFLECTED l PWRREFLECTED
-ampctl l PWRPEAK l PWRPEAK
+./ampctl l NH l NH
+./ampctl l PF l PF
+./ampctl l PWRINPUT l PWRINPUT
+./ampctl l PWRFORWARD l PWRFORWARD
+./ampctl l PWRREFLECTED l PWRREFLECTED
+./ampctl l PWRPEAK l PWRPEAK
# Powerstat 0=Off, 1=On, 2=Standbyd, 4=Operate, 8=Unknown
-ampctl \set_powerstat 0
-ampctl \set_powerstat 1
-ampctl \set_powerstat 2
-ampctl \set_powerstat 4
-ampctl \set_powerstat 8
+./ampctl \set_powerstat 0
+./ampctl \set_powerstat 1
+./ampctl \set_powerstat 2
+./ampctl \set_powerstat 4
+./ampctl \set_powerstat 8
# Sets/reads tuner frequenchy
-ampctl F 14074000
-ampctl f
+./ampctl F 14074000
+./ampctl f
commit 3c214ed676db6a110a41130278d2507d99524805
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 12:52:54 2025 +0200
Make it easier to see what tests are missing
Sorts the list of tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c120165ff..5418dc41d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -106,7 +106,7 @@ endif
EXTRA_DIST = rigmatrix_head.html rig_split_lst.awk testctld.pl testrotctld.pl
# Support 'make check' target for simple tests
-check_SCRIPTS = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh testgrid.sh test2038.sh
+check_SCRIPTS = test2038.sh testbcd.sh testcache.sh testcookie.sh testfreq.sh testgrid.sh testloc.sh testrig.sh testrigcaps.sh
TESTS = $(check_SCRIPTS)
commit d8b02a73e1e7479e0cd3af09ae163cfc3399c045
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 12:13:47 2025 +0200
Add more files to tests/.gitignore
diff --git a/tests/.gitignore b/tests/.gitignore
index 8afb1b8f1..c55a7bae7 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,5 +1,11 @@
ampctl
ampctld
+cachetest
+cachetest2
+dumpmem
+hamlibmodels
+listrigs
+rig_bench
rigctl
rigctlcom
rigctld
@@ -14,5 +20,27 @@ rigtestmcast
rigtestmcastrx
rotctl
rotctld
+test-suite.log
+test2038
+test2038.sh
+testbcd
+testbcd.sh
+testcache
+testcache.sh
+testcookie
+testcookie.sh
+testfreq
+testfreq.sh
+testgrid
+testgrid.sh
testlibusb
+testloc
+testloc.sh
+testmW2power
+testrig
+testrig.sh
+testrigcaps
+testrigcaps.sh
+testrigopen
+testtrn
tuner_control.log
commit 3e43b513d6d048513d621e09b862c9d2971d88eb
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 12:09:01 2025 +0200
Move list of ignored file to tests/ directory
Makes the tests/ directory more self-contained and the top-level
.gitgnore shorter.
diff --git a/.gitignore b/.gitignore
index 05b663024..d03033754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,21 +69,3 @@ scripts/build-w32.sh.*
scripts/build-w64.sh.*
src/hamlibdatetime.h
src/libhamlib.def
-tests/ampctl
-tests/ampctld
-tests/rigctl
-tests/rigctlcom
-tests/rigctld
-tests/rigctlsync
-tests/rigctltcp
-tests/rigfreqwalk
-tests/rigmem
-tests/rigsmtr
-tests/rigswr
-tests/rigtestlibusb
-tests/rigtestmcast
-tests/rigtestmcastrx
-tests/rotctl
-tests/rotctld
-tests/testlibusb
-tuner_control.log
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 000000000..8afb1b8f1
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,18 @@
+ampctl
+ampctld
+rigctl
+rigctlcom
+rigctld
+rigctlsync
+rigctltcp
+rigfreqwalk
+rigmem
+rigsmtr
+rigswr
+rigtestlibusb
+rigtestmcast
+rigtestmcastrx
+rotctl
+rotctld
+testlibusb
+tuner_control.log
commit b2828881b617986d33aa518459ff3b6451ba7415
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Thu Aug 14 11:54:57 2025 +0200
Make output of the TCL test less verbose
Uses the function that gets only the error message corresponding to
the argument passed.
diff --git a/bindings/tcltest.tcl.in b/bindings/tcltest.tcl.in
index 1996224c4..b8ec14952 100644
--- a/bindings/tcltest.tcl.in
+++ b/bindings/tcltest.tcl.in
@@ -56,7 +56,7 @@ puts "status:\t\t[my_rig cget -error_status]"
puts "strength:\t[my_rig get_level_i $RIG_LEVEL_STRENGTH]"
puts "status:\t\t[my_rig cget -error_status]"
-puts "status(str):\t[rigerror [my_rig cget -error_status]]"
+puts "status(str):\t[rigerror2 [my_rig cget -error_status]]"
puts "\nSending Morse, '73'"
my_rig send_morse $RIG_VFO_A "73"
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 18 ---
Makefile.am | 33 ++++-
bindings/tcltest.tcl.in | 2 +-
doc/Makefile.am | 7 +-
include/hamlib/rig.h | 2 +-
perl/Makefile.PL | 19 ---
perl/Makefile.am | 30 -----
rigs/kenwood/Makefile.am | 2 +-
rigs/yaesu/Makefile.am | 2 +-
security/Makefile.am | 2 +-
simulators/.gitignore | 2 +
simulators/Makefile.am | 64 +++++++++-
simulators/simft897.c | 2 +
tests/.gitignore | 46 +++++++
tests/Makefile.am | 23 +++-
tests/amptest.sh | 33 +++--
tests/callback.c | 42 -------
tests/config/unix.exp | 86 -------------
tests/example.c | 2 +-
tests/rigctl.test/rigctl.exp | 61 ----------
tests/testbcd.test/testbcd.exp | 51 --------
tests/testfreq.test/testfreq.exp | 42 -------
tests/testloc.test/testloc.exp | 47 -------
tests/testnet.c | 10 +-
tests/testsecurity.c | 257 ++++++++++++++++++++-------------------
25 files changed, 324 insertions(+), 561 deletions(-)
delete mode 100644 perl/Makefile.PL
delete mode 100644 perl/Makefile.am
create mode 100644 tests/.gitignore
delete mode 100644 tests/callback.c
delete mode 100644 tests/config/unix.exp
delete mode 100644 tests/rigctl.test/rigctl.exp
delete mode 100644 tests/testbcd.test/testbcd.exp
delete mode 100644 tests/testfreq.test/testfreq.exp
delete mode 100644 tests/testloc.test/testloc.exp
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
