diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 270c8eb7a..7be20ef5e 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -3232,6 +3232,18 @@ extern HAMLIB_EXPORT(int) hl_usleep(rig_useconds_t msec); extern HAMLIB_EXPORT(int) rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie, int cookie_len); +extern HAMLIB_EXPORT(int) +longlat2locator HAMLIB_PARAMS((double longitude, + double latitude, + char *locator_res, + int pair_count)); + +extern HAMLIB_EXPORT(int) +locator2longlat HAMLIB_PARAMS((double *longitude, + double *latitude, + const char *locator)); + + //! @endcond __END_DECLS diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h index 5174e1e3a..cd6ff608f 100644 --- a/include/hamlib/rotator.h +++ b/include/hamlib/rotator.h @@ -743,17 +743,6 @@ distance_long_path HAMLIB_PARAMS((double distance)); extern HAMLIB_EXPORT(double) azimuth_long_path HAMLIB_PARAMS((double azimuth)); -extern HAMLIB_EXPORT(int) -longlat2locator HAMLIB_PARAMS((double longitude, - double latitude, - char *locator_res, - int pair_count)); - -extern HAMLIB_EXPORT(int) -locator2longlat HAMLIB_PARAMS((double *longitude, - double *latitude, - const char *locator)); - extern HAMLIB_EXPORT(double) dms2dec HAMLIB_PARAMS((int degrees, int minutes, diff --git a/rigs/icom/Makefile.am b/rigs/icom/Makefile.am index 56fb9a630..aaeaa0acf 100644 --- a/rigs/icom/Makefile.am +++ b/rigs/icom/Makefile.am @@ -8,7 +8,7 @@ ICOMSRC = ic706.c icr8500.c ic735.c ic775.c ic756.c \ id1.c id31.c id51.c id4100.c id5100.c perseus.c ic2730.c \ ic707.c ic728.c ic751.c ic761.c \ ic78.c ic7800.c ic785x.c \ - ic7000.c ic7100.c ic7200.c ic7300.c ic7600.c ic7610.c ic7700.c \ + ic7000.c ic7100.c ic7200.c ic7300.c ic7600.c ic7610.c ic7700.c icf8101.c \ icom.c icom.h icom_defs.h frame.c frame.h ic7300.h optoscan.c optoscan.h x108g.c noinst_LTLIBRARIES = libhamlib-icom.la diff --git a/tests/Makefile.am b/tests/Makefile.am index ca13581e4..7a594f9b5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,7 +16,7 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld $(TESTLIBUSB) -check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie +check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c uthash.h ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h @@ -96,7 +96,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 +check_SCRIPTS = testrig.sh testfreq.sh testbcd.sh testloc.sh testrigcaps.sh testcache.sh testcookie.sh testgrid.sh TESTS = $(check_SCRIPTS) @@ -129,4 +129,8 @@ testcookie.sh: echo './testcookie 1' > testcookie.sh chmod +x ./testcookie.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: + echo './testgrid' > testgrid.sh + chmod +x ./testgrid.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