diff --git a/NEWS b/NEWS index a0c56b11a..c89058188 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,10 @@ Version 1.2.14 libtool files, rigctl improvements, FUNcube string test (works with V0.0 and V1.0), Yaesu newcat.c fixed to use rig->state.current_vfo to store vfo value, add a command to - halt rigctld, + halt rigctld, select PTT source in Kenwood backends (TS-590S), + make sure scan is stopped at IC-9000 opening, thd72 get channel + data (alpha). See ChangeLog for a link to the online log. + Correct typos and SF.net URIs. Version 1.2.13.1 * 2011-05-29 diff --git a/README.release b/README.release index 8e0c4fa60..39df768fc 100644 --- a/README.release +++ b/README.release @@ -56,21 +56,21 @@ remote repository, "origin"): git commit -a # Commit all modified files locally * Create a new branch for the release: - git branch Hamlib-1.2.14 + git branch Hamlib-1.2.15 * Push the changes (check for validity): git push origin # pushes previous commit to sf.net repository - git push -u origin Hamlib-1.2.14 # push the branch and set "upstream" + git push -u origin Hamlib-1.2.15 # push the branch and set "upstream" * Update the version in the macro AC_INIT of configure.ac (advance to next - version, e.g. 1.2.15~git) and the libhamlib_la_LDFLAGS value in + version, e.g. 1.2.16~git) and the libhamlib_la_LDFLAGS value in src/Makefile.am and c++/Makefile.am to match. e.g.: - libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info @ABI_VERSION@:15:0 + libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info @ABI_VERSION@:16:0 Note that -version-info is a libtool flag and reflects ABI compatibility. - In @ABI_VERSION@:15:0, ABI_VERSION is set in configure.ac, 15 is the + In @ABI_VERSION@:16:0, ABI_VERSION is set in configure.ac, 16 is the revision, and :0 should remain 0. When the API is changed, ABI_VERSION - will be advanced, and revision (e.g. :15) will be reset to 0. + will be advanced, and revision (e.g. :16) will be reset to 0. Format is ABI version:revision:age. Setting age to other than 0 causes strange DLL naming in Win32 cross-compile builds. @@ -84,7 +84,7 @@ which will be advanced for the next release candidate or stripped for final release: * Checkout the release branch: - git checkout Hamlib-1.2.14 + git checkout Hamlib-1.2.15 * Edit config.ac, commit it and push it. The branch is now ready for rc testing/release. @@ -126,8 +126,9 @@ See README.build-win32 for information on prerequisites, etc. - Documentation (requires doxygen) make -C doc doc - ssh shell.sourceforge.net mkdir /home/project-web/h/ha/hamlib/htdocs/manuals/x-y-z - scp -r doc/html shell.sourceforge.net:/home/project-web/h/ha/hamlib/htdocs/manuals/x-y-z/. + ssh -t USER,hamlib@shell.sourceforge.net create + mkdir /home/project-web/hamlib/htdocs/manuals/x-y-z + scp -r doc/html/* USER,hamlib@shell.sourceforge.net:/home/project-web/hamlib/htdocs/manuals/x-y-z/. Edit Wiki Documentation section - Supported Radios/Rotators diff --git a/c++/Makefile.am b/c++/Makefile.am index 3e7590871..3f5855d7a 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES = libhamlib++.la libhamlib___la_SOURCES = rigclass.cc rotclass.cc -libhamlib___la_LDFLAGS = -no-undefined -version-info @ABI_VERSION@:14:0 +libhamlib___la_LDFLAGS = -no-undefined -version-info @ABI_VERSION@:15:0 libhamlib___la_LIBADD = $(top_builddir)/src/libhamlib.la check_PROGRAMS = testcpp diff --git a/configure.ac b/configure.ac index 1eca4ec12..f35d44703 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ dnl Please do not use '-' in the version number, 'make rpm' will fail, dnl however, the use of '~' should be fine as apt (others?) will treat dnl it as an earlier version than the actual release. TNX KA6MAL dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars! -AC_INIT([Hamlib],[1.2.14~rc1],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) +AC_INIT([Hamlib],[1.2.15~git],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org]) AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AC_CONFIG_MACRO_DIR([macros]) diff --git a/kenwood/elecraft.h b/kenwood/elecraft.h index d581c74dd..fa9d0d8c0 100644 --- a/kenwood/elecraft.h +++ b/kenwood/elecraft.h @@ -69,5 +69,31 @@ extern const struct confparams elecraft_ext_levels[]; /* Elecraft extension function declarations */ int elecraft_open(RIG *rig); +/* S-meter calibration tables */ + +/* K3 defines 16 values--0-15. + * Table is RASTR value from SM command and dB relative to S9 == 0 + * (see rig_get_level() in src/settings.c + */ +#define K3_STR_CAL { 16, \ + { \ + { 0, -54 }, \ + { 1, -42 }, \ + { 2, -36 }, \ + { 3, -24 }, \ + { 4, -12 }, \ + { 5, -6 }, \ + { 6, 0 }, \ + { 7, 10 }, \ + { 8, 15 }, \ + { 9, 20 }, \ + { 10, 30 }, \ + { 11, 35 }, \ + { 12, 40 }, \ + { 13, 50 }, \ + { 14, 55 }, \ + { 15, 60 }, \ + } } + #endif /* _ELECRAFT_H */ diff --git a/kenwood/k3.c b/kenwood/k3.c index 0e3d7cfaa..025a9c101 100644 --- a/kenwood/k3.c +++ b/kenwood/k3.c @@ -42,7 +42,7 @@ #define K3_LEVEL_ALL (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|RIG_LEVEL_AGC|RIG_LEVEL_SQL|\ RIG_LEVEL_STRENGTH|RIG_LEVEL_RFPOWER|RIG_LEVEL_KEYSPD|\ - RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_MICGAIN) + RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_MICGAIN|RIG_LEVEL_RAWSTR) #define K3_VFO (RIG_VFO_A|RIG_VFO_B) #define K3_VFO_OP (RIG_OP_UP|RIG_OP_DOWN) @@ -183,6 +183,7 @@ const struct rig_caps k3_caps = { {RIG_MODE_FM, kHz(13)}, /* TBC */ RIG_FLT_END, }, + .str_cal = K3_STR_CAL, .priv = (void *)&k3_priv_caps, .rig_init = kenwood_init, diff --git a/src/Makefile.am b/src/Makefile.am index c04cc3c64..368ac1585 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \ lib_LTLIBRARIES = libhamlib.la libhamlib_la_SOURCES = $(RIGSRC) -libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info @ABI_VERSION@:14:0 +libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info @ABI_VERSION@:15:0 libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) -DHAMLIB_MODULE_DIR=\"$(pkglibdir)\" libhamlib_la_LIBADD = @LIBLTDL@ $(top_builddir)/lib/libmisc.la \ @NET_LIBS@ @MATH_LIBS@ $(LIBUSB_LIBS)