[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 4340198076ea9f0e65e34
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: n0nb <n0...@us...> - 2025-08-24 21:20:39
|
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 4340198076ea9f0e65e34356fef3a82d8c3583e9 (commit) via bc8dbca1f3a06de5faa69cd96f7b4e6c5819ac34 (commit) via 5ba906c9aaf532c3d4817ab01ba027f2c9dc58fc (commit) via 844bd8eba8c3efd06e90e3b8157b1295d8bde9a2 (commit) via b5db8e3200cc59651bf2e2e2eee186671b21f564 (commit) via 1194125b3d58170f3bd32a1d1b8e0c47ba614650 (commit) from 17cb45f2f0424bff46dc0ac26d93543a2781136e (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 4340198076ea9f0e65e34356fef3a82d8c3583e9 Merge: 17cb45f2f bc8dbca1f Author: Nate Bargmann <n0...@n0...> Date: Sun Aug 24 15:54:07 2025 -0500 Merge GitHub PR #1865 commit bc8dbca1f3a06de5faa69cd96f7b4e6c5819ac34 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Aug 24 20:18:30 2025 +0200 Remove duplicated rig_type[] lines diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c index 4c5805730..8962ee1b0 100644 --- a/tests/dumpcaps.c +++ b/tests/dumpcaps.c @@ -55,7 +55,6 @@ struct rig_type_s rig_type[] = {RIG_FLAG_APRS, "APRS"}, {RIG_FLAG_TNC, "TNC"}, {RIG_FLAG_DXCLUSTER, "DxCluster"}, - {RIG_FLAG_DXCLUSTER, "DxCluster"}, {RIG_FLAG_TUNER, "Tuner"}, {-1, "?\n"} }; diff --git a/tests/dumpstate.c b/tests/dumpstate.c index ff66ce54a..09798cfc3 100644 --- a/tests/dumpstate.c +++ b/tests/dumpstate.c @@ -54,7 +54,6 @@ static struct rig_type_s rig_type[] = {RIG_FLAG_APRS, "APRS"}, {RIG_FLAG_TNC, "TNC"}, {RIG_FLAG_DXCLUSTER, "DxCluster"}, - {RIG_FLAG_DXCLUSTER, "DxCluster"}, {RIG_FLAG_TUNER, "Tuner"}, {-1, "?\n"} }; commit 5ba906c9aaf532c3d4817ab01ba027f2c9dc58fc Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Aug 20 21:32:10 2025 +0200 Document building testsecurity At some time, the commented out line check_PROGRAMS removed by this commit was identical to the line following it, plus testsecurity appended, then they went out of sync. The commented out line check_PROGRAMS added by this commit appends testsecurity in an explicit way. diff --git a/tests/Makefile.am b/tests/Makefile.am index ed9b45fd7..6a01d8684 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,8 +16,9 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom rigctltcp rigctlsync ampctl ampctld rigtestmcast rigtestmcastrx $(TESTLIBUSB) rigfreqwalk -#check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid testsecurity check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid hamlibmodels testmW2power test2038 +# Document building testsecurity +### check_PROGRAMS += testsecurity RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c dumpstate.c uthash.h rig_tests.c rig_tests.h dumpcaps.h ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h dumpcaps_rot.h commit 844bd8eba8c3efd06e90e3b8157b1295d8bde9a2 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Aug 17 15:33:34 2025 +0200 Remove unneeded dependencies make knows how to build an executable from a single C source file diff --git a/tests/Makefile.am b/tests/Makefile.am index 9d6aceb0c..ed9b45fd7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,8 +32,6 @@ rotctl_SOURCES = rotctl.c $(ROTCOMMONSRC) rotctld_SOURCES = rotctld.c $(ROTCOMMONSRC) ampctl_SOURCES = ampctl.c $(AMPCOMMONSRC) ampctld_SOURCES = ampctld.c $(AMPCOMMONSRC) -rigswr_SOURCES = rigswr.c -rigsmtr_SOURCES = rigsmtr.c rigmem_SOURCES = rigmem.c memsave.c memload.c memcsv.c if HAVE_LIBUSB rigtestlibusb_SOURCES = rigtestlibusb.c commit b5db8e3200cc59651bf2e2e2eee186671b21f564 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Aug 20 17:41:20 2025 +0200 Add conditionally generated file to .gitignore and CLEANFILES No need to add it *conditionally* to CLEANFILES because for make it isn't an error trying to delete a file that doesn't exist. diff --git a/tests/.gitignore b/tests/.gitignore index c55a7bae7..2e11b9215 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -12,6 +12,7 @@ rigctld rigctlsync rigctltcp rigfreqwalk +rigmatrix rigmem rigsmtr rigswr diff --git a/tests/Makefile.am b/tests/Makefile.am index ab63d9d86..9d6aceb0c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -166,4 +166,4 @@ test2038.sh: echo 'LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(top_builddir)/dummy/.libs ./test2038 1' > test2038.sh chmod +x ./test2038.sh -CLEANFILES = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh rigtestlibusb build-w32.sh build-w64.sh build-w64-jtsdk.sh testgrid.sh testrigcaps.sh test2038.sh tuner_control.log +CLEANFILES = rigmatrix testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh rigtestlibusb build-w32.sh build-w64.sh build-w64-jtsdk.sh testgrid.sh testrigcaps.sh test2038.sh tuner_control.log commit 1194125b3d58170f3bd32a1d1b8e0c47ba614650 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Aug 17 16:06:39 2025 +0200 Remove unused code, apparently copied from rotctl_parse.c and modified diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c index e47b6c1ff..375cee160 100644 --- a/tests/ampctl_parse.c +++ b/tests/ampctl_parse.c @@ -2108,313 +2108,3 @@ declare_proto_amp(send_cmd) return retval; } - - -/* 'L' */ -/* -declare_proto_amp(lonlat2loc) -{ - unsigned char loc[MAXARGSZ + 1]; - double lat, lon; - int err, pair; - - CHKSCN1ARG(sscanf(arg1, "%lf", &lon)); - CHKSCN1ARG(sscanf(arg2, "%lf", &lat)); - CHKSCN1ARG(sscanf(arg3, "%d", &pair)); - - pair /= 2; - - err = longlat2locator(lon, lat, (char *)&loc, pair); - - if (err != RIG_OK) - { - return err; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg4); - } - - fprintf(fout, "%s%c", loc, resp_sep); - - return err; -} -*/ - - -/* 'l' */ -/* -declare_proto_amp(loc2lonlat) -{ - unsigned char loc[MAXARGSZ + 1]; - double lat, lon; - int status; - - CHKSCN1ARG(sscanf(arg1, "%s", (char *)&loc)); - - status = locator2longlat(&lon, &lat, (const char *)loc); - - if (status != RIG_OK) - { - return status; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg2); - } - - fprintf(fout, "%f%c", lon, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg3); - } - - fprintf(fout, "%f%c", lat, resp_sep); - - return status; -} -*/ - - -/* 'D' */ -/* -declare_proto_amp(d_m_s2dec) -{ - int deg, min, sw; - double sec, dec_deg; - - CHKSCN1ARG(sscanf(arg1, "%d", °)); - CHKSCN1ARG(sscanf(arg2, "%d", &min)); - CHKSCN1ARG(sscanf(arg3, "%lf", &sec)); - CHKSCN1ARG(sscanf(arg4, "%d", &sw)); - - dec_deg = dms2dec(deg, min, sec, sw); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg5); - } - - fprintf(fout, "%lf%c", dec_deg, resp_sep); - - return RIG_OK; -} -*/ - - -/* 'd' */ -/* -declare_proto_amp(dec2d_m_s) -{ - int deg, min, sw, err; - double sec, dec_deg; - - CHKSCN1ARG(sscanf(arg1, "%lf", &dec_deg)); - - err = dec2dms(dec_deg, °, &min, &sec, &sw); - - if (err != RIG_OK) - { - return err; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg2); - } - - fprintf(fout, "%d%c", deg, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg3); - } - - fprintf(fout, "%d%c", min, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg4); - } - - fprintf(fout, "%lf%c", sec, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg5); - } - - fprintf(fout, "%d%c", sw, resp_sep); - - return err; -} -*/ - - -/* 'E' */ -/* -declare_proto_amp(d_mm2dec) -{ - int deg, sw; - double dec_deg, min; - - CHKSCN1ARG(sscanf(arg1, "%d", °)); - CHKSCN1ARG(sscanf(arg2, "%lf", &min)); - CHKSCN1ARG(sscanf(arg3, "%d", &sw)); - - dec_deg = dmmm2dec(deg, min, sw); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg4); - } - - fprintf(fout, "%lf%c", dec_deg, resp_sep); - - return RIG_OK; -} -*/ - - -/* 'e' */ -/* -declare_proto_amp(dec2d_mm) -{ - int deg, sw, err; - double min, dec_deg; - - CHKSCN1ARG(sscanf(arg1, "%lf", &dec_deg)); - - err = dec2dmmm(dec_deg, °, &min, &sw); - - if (err != RIG_OK) - { - return err; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg2); - } - - fprintf(fout, "%d%c", deg, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg3); - } - - fprintf(fout, "%lf%c", min, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg4); - } - - fprintf(fout, "%d%c", sw, resp_sep); - - return err; -} -*/ - - -/* 'B' */ -/* -declare_proto_amp(coord2qrb) -{ - double lon1, lat1, lon2, lat2, dist, az; - int err; - - CHKSCN1ARG(sscanf(arg1, "%lf", &lon1)); - CHKSCN1ARG(sscanf(arg2, "%lf", &lat1)); - CHKSCN1ARG(sscanf(arg3, "%lf", &lon2)); - CHKSCN1ARG(sscanf(arg4, "%lf", &lat2)); - - err = qrb(lon1, lat1, lon2, lat2, &dist, &az); - - if (err != RIG_OK) - { - return err; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg5); - } - - fprintf(fout, "%lf%c", dist, resp_sep); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg6); - } - - fprintf(fout, "%lf%c", az, resp_sep); - - return err; -} -*/ - - -/* 'A' */ -/* -declare_proto_amp(az_sp2az_lp) -{ - double az_sp, az_lp; - - CHKSCN1ARG(sscanf(arg1, "%lf", &az_sp)); - - az_lp = azimuth_long_path(az_sp); - - if (az_lp < 0) - { - return -RIG_EINVAL; - } - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg2); - } - - fprintf(fout, "%lf%c", az_lp, resp_sep); - - return RIG_OK; -} -*/ - - -/* 'a' */ -/* -declare_proto_amp(dist_sp2dist_lp) -{ - double dist_sp, dist_lp; - - CHKSCN1ARG(sscanf(arg1, "%lf", &dist_sp)); - - dist_lp = distance_long_path(dist_sp); - - if ((interactive && prompt) || (interactive && !prompt && ext_resp)) - { - fprintf(fout, "%s: ", cmd->arg2); - } - - fprintf(fout, "%lf%c", dist_lp, resp_sep); - - return RIG_OK; -} -*/ - - -/* '0x8c'--pause processing */ -/* -declare_proto_amp(pause) -{ - unsigned seconds; - CHKSCN1ARG(sscanf(arg1, "%u", &seconds)); - sleep(seconds); - return RIG_OK; -} -*/ ----------------------------------------------------------------------- Summary of changes: tests/.gitignore | 1 + tests/Makefile.am | 7 +- tests/ampctl_parse.c | 310 --------------------------------------------------- tests/dumpcaps.c | 1 - tests/dumpstate.c | 1 - 5 files changed, 4 insertions(+), 316 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |