[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. fe3bb8b84a47ec4e928e6
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: n0nb <n0...@us...> - 2025-05-02 01:49:57
|
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 fe3bb8b84a47ec4e928e65fc5a9a104b89747162 (commit) via c8838cd3a6f4ea57ccbde8cb646c5a4fbfd82a3e (commit) via 12265fde9ad35e36ebdf591f0d88421dd08e121c (commit) via 7c5c71588881fe9c81eb9c0ce15544703208db44 (commit) via edef6206f7e11b74237e927939a5b1ea6ceecfdb (commit) via 5cf875582756aec6c4d5f97267a37374e05541f1 (commit) via a395b91be6bd19d760e57005ecb8079b15af9ede (commit) via dda30532b512e34d65308c03dd68205de09ba2b8 (commit) via bd5ed18bddbef070b893ed278c6e12d6706739f3 (commit) via c1788e2cf86edfad398ff6eb7e7e5389cc58cf66 (commit) via 56b075ab452c92017a9a144c74dcebd5271c5fa3 (commit) via 8feb174711bcc6756e46547837116499b80e2057 (commit) via 24eafbd2a4affe66e6cef0af38343652a4a54f09 (commit) via aeb827a2f1dab1d7a481e873890e8beee0ddb8ab (commit) via 3448c735b064dccd2aea26d5b15c9a30d06a1650 (commit) via 037c4953ed1f7d3b31b2c09d48dbf9e79210b8b1 (commit) from d03cde33b05367231b69309064edae9aef402f5a (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 fe3bb8b84a47ec4e928e65fc5a9a104b89747162 Merge: 12265fde9 c8838cd3a Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 20:48:00 2025 -0500 Merge pull request #1722 from N0NB/aclog_get_freq-thousands_separator Avoid truncating AC Log frequencies above 1 GHz commit c8838cd3a6f4ea57ccbde8cb646c5a4fbfd82a3e Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 19:49:44 2025 -0500 Avoid truncating AC Log frequencies above 1 GHz Per GitHub issue #1704, frequencies higher than 1 GHz passed from AC Log have an embedded comma. Even though sscanf() offers the "'" (single quote) character as a means of ignoring thousands separator, apparently it depends on the environment variable LC_NUMERIC being set correctly and that may not be supported on all platforms. This patch just parses through the string while skipping any comma that may appear and then uses strtold() to convert to a numeric variable. It is supected that AC Log always uses a comma as a thousands separator. diff --git a/rigs/dummy/aclog.c b/rigs/dummy/aclog.c index 8baeef075..3b9fb4cef 100644 --- a/rigs/dummy/aclog.c +++ b/rigs/dummy/aclog.c @@ -19,6 +19,7 @@ * */ +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -421,9 +422,14 @@ static rmode_t modeMapGetHamlib(const char *modeACLog) /* * aclog_get_freq * Assumes rig!=NULL, STATE(rig)->priv!=NULL, freq!=NULL +* +* string='<CMD><READBMFRESPONSE><BAND>23</BAND><MODE>SSB</MODE><MODETEST>PH</MODETEST><FREQ>1,296.171100</FREQ></CMD> ' */ static int aclog_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { + int i, j = 0; + char f_string[32]; + char value[MAXARGLEN]; struct aclog_priv_data *priv = (struct aclog_priv_data *) STATE(rig)->priv; @@ -461,7 +467,30 @@ static int aclog_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) char *p = strstr(value, "<FREQ>"); *freq = 0; - if (p) { sscanf(p, "<FREQ>%'lf", freq); } + if (p) + { + // Move the pointer to the first digit. + p += strlen("<FREQ>"); + + // Parse "1,296.171100" ignoring the comma. + for (i = 0; p[i] != '<'; i++) + { + if (isdigit(p[i])) + { + f_string[j++] = p[i]; + } + else if (ispunct(p[i]) && p[i] == '.') + { + f_string[j++] = p[i]; + } + } + + f_string[j] = '\0'; + rig_debug(RIG_DEBUG_TRACE, "%s: f_string=%s\n", __func__, f_string); + + *freq = strtold(f_string, NULL); + rig_debug(RIG_DEBUG_TRACE, "%s: freq=%.0f\n", __func__, *freq); + } *freq *= 1e6; // convert from MHz to Hz commit 12265fde9ad35e36ebdf591f0d88421dd08e121c Merge: 7c5c71588 5cf875582 Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 12:17:44 2025 -0500 Merge pull request #1720 from N0NB/lua_macro Update ax_lua.m4 macro file commit 7c5c71588881fe9c81eb9c0ce15544703208db44 Merge: edef6206f a395b91be Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 12:17:24 2025 -0500 Merge pull request #1719 from jj1bdx/jj1bdx-ic705-wfm Add support of setting IC-705 WFM mode commit edef6206f7e11b74237e927939a5b1ea6ceecfdb Merge: d03cde33b dda30532b Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 12:16:44 2025 -0500 Merge pull request #1718 from dforsi/fix/typos Fix/typos commit 5cf875582756aec6c4d5f97267a37374e05541f1 Author: Nate Bargmann <n0...@n0...> Date: Thu May 1 07:04:04 2025 -0500 Update ax_lua.m4 macro file Per GitHub issue #1712, the older macro file was causing bootstrap issues on Fedora 42. diff --git a/configure.ac b/configure.ac index a2b22ed0b..ea06ba611 100644 --- a/configure.ac +++ b/configure.ac @@ -667,6 +667,10 @@ AC_SUBST([TCL_CFLAGS]) dnl Check for lua availability, so we can enable HamlibLua + +dnl Newer ax_lua.m4 macro, at least Serial 47, requires LUAJIT be present. +AM_CONDITIONAL([LUAJIT], [false]) + # Lua bindings AC_MSG_CHECKING([whether to build lua binding]) AC_ARG_WITH([lua-binding], diff --git a/macros/ax_lua.m4 b/macros/ax_lua.m4 index 7607c5fe2..5f63cacee 100644 --- a/macros/ax_lua.m4 +++ b/macros/ax_lua.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_lua.html +# https://www.gnu.org/software/autoconf-archive/ax_lua.html # =========================================================================== # # SYNOPSIS @@ -19,7 +19,7 @@ # header is checked to match the Lua interpreter version exactly. When # searching for Lua libraries, the version number is used as a suffix. # This is done with the goal of supporting multiple Lua installs (5.1, -# 5.2, and 5.3 side-by-side). +# 5.2, 5.3, and 5.4 side-by-side). # # A note on compatibility with previous versions: This file has been # mostly rewritten for serial 18. Most developers should be able to use @@ -49,6 +49,14 @@ # interpreter. If LUA is blank, the user's path is searched for an # suitable interpreter. # +# Optionally a LUAJIT option may be set ahead of time to look for and +# validate a LuaJIT install instead of PUC Lua. Usage might look like: +# +# AC_ARG_WITH(luajit, [AS_HELP_STRING([--with-luajit], +# [Prefer LuaJIT over PUC Lua, even if the latter is newer. Default: no]) +# ]) +# AM_CONDITIONAL([LUAJIT], [test "x$with_luajit" != 'xno']) +# # If MINIMUM-VERSION is supplied, then only Lua interpreters with a # version number greater or equal to MINIMUM-VERSION will be accepted. If # TOO-BIG-VERSION is also supplied, then only Lua interpreters with a @@ -152,6 +160,7 @@ # # LICENSE # +# Copyright (c) 2023 Caleb Maclennan <ca...@al...> # Copyright (c) 2015 Reuben Thomas <rr...@sc...> # Copyright (c) 2014 Tim Perkins <tp...@gm...> # @@ -166,7 +175,7 @@ # Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. +# with this program. If not, see <https://www.gnu.org/licenses/>. # # As a special exception, the respective Autoconf Macro's copyright owner # gives unlimited permission to copy, distribute and modify the configure @@ -181,7 +190,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 39 +#serial 47 dnl ========================================================================= dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION], @@ -197,13 +206,14 @@ AC_DEFUN([AX_PROG_LUA], AC_ARG_VAR([LUA], [The Lua interpreter, e.g. /usr/bin/lua5.1]) dnl Find a Lua interpreter. - m4_define_default([_AX_LUA_INTERPRETER_LIST], - [lua lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua50]) + AM_COND_IF([LUAJIT], + [_ax_lua_interpreter_list='luajit luajit-2.1.0-beta3 luajit-2.0.5 luajit-2.0.4 luajit-2.0.3'], + [_ax_lua_interpreter_list='lua lua5.4 lua54 lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua5.0 lua50']) m4_if([$1], [], [ dnl No version check is needed. Find any Lua interpreter. AS_IF([test "x$LUA" = 'x'], - [AC_PATH_PROGS([LUA], [_AX_LUA_INTERPRETER_LIST], [:])]) + [AC_PATH_PROGS([LUA], [$_ax_lua_interpreter_list], [:])]) ax_display_LUA='lua' AS_IF([test "x$LUA" != 'x:'], @@ -242,7 +252,7 @@ AC_DEFUN([AX_PROG_LUA], [_ax_check_text="for a Lua interpreter with version >= $1, < $2"]) AC_CACHE_CHECK([$_ax_check_text], [ax_cv_pathless_LUA], - [ for ax_cv_pathless_LUA in _AX_LUA_INTERPRETER_LIST none; do + [ for ax_cv_pathless_LUA in $_ax_lua_interpreter_list none; do test "x$ax_cv_pathless_LUA" = 'xnone' && break _AX_LUA_CHK_IS_INTRP([$ax_cv_pathless_LUA], [], [continue]) _AX_LUA_CHK_VER([$ax_cv_pathless_LUA], [$1], [$2], [break]) @@ -268,13 +278,25 @@ AC_DEFUN([AX_PROG_LUA], ax_cv_lua_version=[`$LUA -e ' -- return a version number in X.Y format local _, _, ver = string.find(_VERSION, "^Lua (%d+%.%d+)") - print(ver)'`] + print(ver or "")'`] ]) AS_IF([test "x$ax_cv_lua_version" = 'x'], [AC_MSG_ERROR([invalid Lua version number])]) AC_SUBST([LUA_VERSION], [$ax_cv_lua_version]) AC_SUBST([LUA_SHORT_VERSION], [`echo "$LUA_VERSION" | $SED 's|\.||'`]) + AM_COND_IF([LUAJIT], [ + AC_CACHE_CHECK([for $ax_display_LUA jit version], [ax_cv_luajit_version], + [ ax_cv_luajit_version=[`$LUA -e ' + local _, _, ver = string.find(jit and jit.version, "(%d+%..+)") + print(ver or "")'`] + ]) + AS_IF([test "x$ax_cv_luajit_version" = 'x'], + [AC_MSG_ERROR([invalid Lua jit version number])]) + AC_SUBST([LUAJIT_VERSION], [$ax_cv_luajit_version]) + AC_SUBST([LUAJIT_SHORT_VERSION], [$(echo "$LUAJIT_VERSION" | $SED 's|\.|§|;s|\..*||;s|§|.|')]) + ]) + dnl The following check is not supported: dnl At times (like when building shared libraries) you may want to know dnl which OS platform Lua thinks this is. @@ -464,33 +486,50 @@ AC_DEFUN([AX_LUA_HEADERS], AC_MSG_ERROR([cannot check Lua headers without knowing LUA_VERSION]) ]) + AM_COND_IF([LUAJIT],[ + dnl Check for LUAJIT_VERSION. + AC_MSG_CHECKING([if LUAJIT_VERSION is defined]) + AS_IF([test "x$LUAJIT_VERSION" != 'x'], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot check Lua jit headers without knowing LUAJIT_VERSION]) + ]) + ]) + dnl Make LUA_INCLUDE a precious variable. AC_ARG_VAR([LUA_INCLUDE], [The Lua includes, e.g. -I/usr/include/lua5.1]) - dnl Some default directories to search. - LUA_SHORT_VERSION=`echo "$LUA_VERSION" | $SED 's|\.||'` - m4_define_default([_AX_LUA_INCLUDE_LIST], - [ /usr/include/lua$LUA_VERSION \ - /usr/include/lua-$LUA_VERSION \ - /usr/include/lua/$LUA_VERSION \ - /usr/include/lua$LUA_SHORT_VERSION \ - /usr/local/include/lua$LUA_VERSION \ - /usr/local/include/lua-$LUA_VERSION \ - /usr/local/include/lua/$LUA_VERSION \ - /usr/local/include/lua$LUA_SHORT_VERSION \ - ]) + dnl Some default directories to search. + AM_COND_IF([LUAJIT], + [_ax_lua_include_list=" + /usr/include/luajit-$LUAJIT_VERSION + /usr/include/luajit-$LUAJIT_SHORT_VERSION + /usr/local/include/luajit-$LUAJIT_VERSION + /usr/local/include/luajit-$LUAJIT_SHORT_VERSION"], + [_ax_lua_include_list=" + /usr/include/lua$LUA_VERSION + /usr/include/lua-$LUA_VERSION + /usr/include/lua/$LUA_VERSION + /usr/include/lua$LUA_SHORT_VERSION + /usr/local/include/lua$LUA_VERSION + /usr/local/include/lua-$LUA_VERSION + /usr/local/include/lua/$LUA_VERSION + /usr/local/include/lua$LUA_SHORT_VERSION"]) dnl Try to find the headers. _ax_lua_saved_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $LUA_INCLUDE" AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h]) + AM_COND_IF([LUAJIT], [AC_CHECK_HEADERS([luajit.h])]) CPPFLAGS=$_ax_lua_saved_cppflags dnl Try some other directories if LUA_INCLUDE was not set. AS_IF([test "x$LUA_INCLUDE" = 'x' && - test "x$ac_cv_header_lua_h" != 'xyes'], + test "x$ac_cv_header_lua_h" != 'xyes' || + test "x$with_luajit" != 'xno' && + test "x$ac_cv_header_luajit_h" != 'xyes'], [ dnl Try some common include paths. - for _ax_include_path in _AX_LUA_INCLUDE_LIST; do + for _ax_include_path in $_ax_lua_include_list; do test ! -d "$_ax_include_path" && continue AC_MSG_CHECKING([for Lua headers in]) @@ -500,10 +539,12 @@ AC_DEFUN([AX_LUA_HEADERS], AS_UNSET([ac_cv_header_lualib_h]) AS_UNSET([ac_cv_header_lauxlib_h]) AS_UNSET([ac_cv_header_luaconf_h]) + AS_UNSET([ac_cv_header_luajit_h]) _ax_lua_saved_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$_ax_include_path" AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h]) + AM_COND_IF([LUAJIT], [AC_CHECK_HEADERS([luajit.h])]) CPPFLAGS=$_ax_lua_saved_cppflags AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'], @@ -524,22 +565,17 @@ AC_DEFUN([AX_LUA_HEADERS], [ax_cv_lua_header_version], [ _ax_lua_saved_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $LUA_INCLUDE" - AC_RUN_IFELSE( - [ AC_LANG_SOURCE([[ + AC_COMPUTE_INT(ax_cv_lua_header_version_major,[LUA_VERSION_NUM/100],[AC_INCLUDES_DEFAULT #include <lua.h> -#include <stdlib.h> -#include <stdio.h> -int main(int argc, char ** argv) -{ - if(argc > 1) printf("%s", LUA_VERSION); - exit(EXIT_SUCCESS); -} -]]) - ], - [ ax_cv_lua_header_version=`./conftest$EXEEXT p | \ - $SED -n "s|^Lua \(@<:@0-9@:>@\{1,\}\.@<:@0-9@:>@\{1,\}\).\{0,\}|\1|p"` - ], - [ax_cv_lua_header_version='unknown']) +],[ax_cv_lua_header_version_major=unknown]) + AC_COMPUTE_INT(ax_cv_lua_header_version_minor,[LUA_VERSION_NUM%100],[AC_INCLUDES_DEFAULT +#include <lua.h> +],[ax_cv_lua_header_version_minor=unknown]) + AS_IF([test "x$ax_cv_lua_header_version_major" = xunknown || test "x$ax_cv_lua_header_version_minor" = xunknown],[ + ax_cv_lua_header_version=unknown + ],[ + ax_cv_lua_header_version="$ax_cv_lua_header_version_major.$ax_cv_lua_header_version_minor" + ]) CPPFLAGS=$_ax_lua_saved_cppflags ]) @@ -626,16 +662,26 @@ AC_DEFUN([AX_LUA_LIBS], dnl Try to find the Lua libs. _ax_lua_saved_libs=$LIBS LIBS="$LIBS $LUA_LIB" - AC_SEARCH_LIBS([lua_load], - [ lua$LUA_VERSION \ - lua$LUA_SHORT_VERSION \ - lua-$LUA_VERSION \ - lua-$LUA_SHORT_VERSION \ - lua \ - ], - [_ax_found_lua_libs='yes'], - [_ax_found_lua_libs='no'], - [$_ax_lua_extra_libs]) + AM_COND_IF([LUAJIT], + [AC_SEARCH_LIBS([lua_load], + [ luajit$LUA_VERSION \ + luajit$LUA_SHORT_VERSION \ + luajit-$LUA_VERSION \ + luajit-$LUA_SHORT_VERSION \ + luajit], + [_ax_found_lua_libs='yes'], + [_ax_found_lua_libs='no'], + [$_ax_lua_extra_libs])], + [AC_SEARCH_LIBS([lua_load], + [ lua$LUA_VERSION \ + lua$LUA_SHORT_VERSION \ + lua-$LUA_VERSION \ + lua-$LUA_SHORT_VERSION \ + lua \ + ], + [_ax_found_lua_libs='yes'], + [_ax_found_lua_libs='no'], + [$_ax_lua_extra_libs])]) LIBS=$_ax_lua_saved_libs AS_IF([test "x$ac_cv_search_lua_load" != 'xno' && commit a395b91be6bd19d760e57005ecb8079b15af9ede Author: Kenji Rikitake <ken...@ac...> Date: Thu May 1 02:29:16 2025 +0000 Add support of setting IC-705 WFM mode On IC-705, setting WFM mode via ICOM CI-V command 0x26 does not work. This patch implements a workaround using CI-V command 0x06 instead via icom_set_mode_without_data for IC-705 setting mode WFM. diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c index 1aed17acc..16e3602db 100644 --- a/rigs/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -149,7 +149,7 @@ int ic9700_set_vfo(RIG *rig, vfo_t vfo); */ #define IC705_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT|RIG_PARM_SCREENSAVER|RIG_PARM_TIME|RIG_PARM_BEEP|RIG_PARM_KEYERTYPE|RIG_PARM_AFIF|RIG_PARM_AFIF_WLAN) #define IC705_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR) -#define IC705_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM|RIG_MODE_DSTAR) +#define IC705_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM|RIG_MODE_DSTAR|RIG_MODE_WFM) #define IC705_OTHER_TX_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR) #define IC705_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_SPECTRUM_MODE|RIG_LEVEL_SPECTRUM_SPAN|RIG_LEVEL_SPECTRUM_SPEED|RIG_LEVEL_SPECTRUM_REF|RIG_LEVEL_SPECTRUM_AVG|RIG_LEVEL_SPECTRUM_EDGE_LOW|RIG_LEVEL_SPECTRUM_EDGE_HIGH) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index cd05edcdb..b55608983 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -2574,7 +2574,9 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) (int) base_mode, (int) width, rig_strvfo(rs->current_vfo)); // It is only necessary to change base mode if command 0x26 is not supported - if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) + // NOTE: IC-705 does not support WFM for command 0x26 + if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap || + (RIG_IS_IC705 && (mode == RIG_MODE_WFM))) { retval = icom_set_mode_without_data(rig, vfo, base_mode, width); } commit dda30532b512e34d65308c03dd68205de09ba2b8 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Apr 30 19:04:14 2025 +0200 Add cross references hash mark for Doxygen diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 1e3486ef1..a6bc0a7e6 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -744,7 +744,7 @@ typedef enum { * NOTE: the vfo argument for some vfo operation may be irrelevant, * and thus will be ignored. * - * The VFO/MEM "mode" is set by rig_set_vfo.\n + * The VFO/MEM "mode" is set by #rig_set_vfo.\n * \c STRING used in rigctl * * \sa rig_parse_vfo_op(), rig_strvfop() @@ -1065,10 +1065,10 @@ typedef uint64_t rig_level_e; #define RIG_LEVEL_KEYSPD CONSTANT_64BIT_FLAG(14) /*!< \c KEYSPD -- Key Speed, arg int (WPM) */ #define RIG_LEVEL_NOTCHF CONSTANT_64BIT_FLAG(15) /*!< \c NOTCHF -- Notch Freq., arg int (Hz) */ #define RIG_LEVEL_COMP CONSTANT_64BIT_FLAG(16) /*!< \c COMP -- Compressor, arg float [0.0 ... 1.0] */ -#define RIG_LEVEL_AGC CONSTANT_64BIT_FLAG(17) /*!< \c AGC -- AGC, arg int (see enum agc_level_e) */ +#define RIG_LEVEL_AGC CONSTANT_64BIT_FLAG(17) /*!< \c AGC -- AGC, arg int (see enum #agc_level_e) */ #define RIG_LEVEL_BKINDL CONSTANT_64BIT_FLAG(18) /*!< \c BKINDL -- BKin Delay, arg int (tenth of dots) */ #define RIG_LEVEL_BALANCE CONSTANT_64BIT_FLAG(19) /*!< \c BAL -- Balance (Dual Watch) arg float [0.0 ... 1.0] */ -#define RIG_LEVEL_METER CONSTANT_64BIT_FLAG(20) /*!< \c METER -- Display meter, arg int (see enum meter_level_e) */ +#define RIG_LEVEL_METER CONSTANT_64BIT_FLAG(20) /*!< \c METER -- Display meter, arg int (see enum #meter_level_e) */ #define RIG_LEVEL_VOXGAIN CONSTANT_64BIT_FLAG(21) /*!< \c VOXGAIN -- VOX gain level, arg float [0.0 ... 1.0] */ #define RIG_LEVEL_ANTIVOX CONSTANT_64BIT_FLAG(22) /*!< \c ANTIVOX -- anti-VOX level, arg float [0.0 ... 1.0] */ #define RIG_LEVEL_SLOPE_LOW CONSTANT_64BIT_FLAG(23) /*!< \c SLOPE_LOW -- Slope tune, low frequency cut, arg int (Hz) */ @@ -1091,7 +1091,7 @@ typedef uint64_t rig_level_e; #define RIG_LEVEL_MONITOR_GAIN CONSTANT_64BIT_FLAG(37) /*!< \c MONITOR_GAIN -- Monitor gain (level for monitoring of transmitted audio) arg float [0.0 ... 1.0] */ #define RIG_LEVEL_NB CONSTANT_64BIT_FLAG(38) /*!< \c NB -- Noise Blanker level, arg float [0.0 ... 1.0] */ #define RIG_LEVEL_RFPOWER_METER_WATTS CONSTANT_64BIT_FLAG(39) /*!< \c RFPOWER_METER_WATTS -- RF power output meter, arg float [0.0 ... MAX] (output power in watts) */ -#define RIG_LEVEL_SPECTRUM_MODE CONSTANT_64BIT_FLAG(40) /*!< \c SPECTRUM_MODE -- Spectrum scope mode, arg int (see enum rig_spectrum_mode_e). Supported modes defined in rig caps. */ +#define RIG_LEVEL_SPECTRUM_MODE CONSTANT_64BIT_FLAG(40) /*!< \c SPECTRUM_MODE -- Spectrum scope mode, arg int (see enum #rig_spectrum_mode_e). Supported modes defined in rig caps. */ #define RIG_LEVEL_SPECTRUM_SPAN CONSTANT_64BIT_FLAG(41) /*!< \c SPECTRUM_SPAN -- Spectrum scope span in center mode, arg int (Hz). Supported spans defined in rig caps. */ #define RIG_LEVEL_SPECTRUM_EDGE_LOW CONSTANT_64BIT_FLAG(42) /*!< \c SPECTRUM_EDGE_LOW -- Spectrum scope low edge in fixed mode, arg int (Hz) */ #define RIG_LEVEL_SPECTRUM_EDGE_HIGH CONSTANT_64BIT_FLAG(43) /*!< \c SPECTRUM_EDGE_HIGH -- Spectrum scope high edge in fixed mode, arg int (Hz) */ @@ -1136,7 +1136,7 @@ typedef uint64_t rig_level_e; */ enum rig_parm_e { RIG_PARM_NONE = 0, /*!< '' -- No Parm */ - RIG_PARM_ANN = (1 << 0), /*!< \c ANN -- "Announce" level, see ann_t */ + RIG_PARM_ANN = (1 << 0), /*!< \c ANN -- "Announce" level, see #ann_t */ RIG_PARM_APO = (1 << 1), /*!< \c APO -- Auto power off, int in minute */ RIG_PARM_BACKLIGHT = (1 << 2), /*!< \c BACKLIGHT -- LCD light, float [0.0 ... 1.0] */ RIG_PARM_BEEP = (1 << 4), /*!< \c BEEP -- Beep on keypressed, int (0,1) */ @@ -1696,7 +1696,7 @@ typedef enum { struct chan_list { int startc; /*!< Starting memory channel \b number */ int endc; /*!< Ending memory channel \b number */ - chan_type_t type; /*!< Memory type. see chan_type_t */ + chan_type_t type; /*!< Memory type. See #chan_type_t */ channel_cap_t mem_caps; /*!< Definition of attributes that can be stored/retrieved */ }; diff --git a/src/extamp.c b/src/extamp.c index 19552b651..278e308bf 100644 --- a/src/extamp.c +++ b/src/extamp.c @@ -259,7 +259,7 @@ const struct confparams *HAMLIB_API amp_ext_lookup_tok(AMP *amp, * \note As this function calls amp_ext_lookup(), it can be considered a * higher level API. * - * \return The token ID or RIG_CONF_END if there is a lookup failure. + * \return The token ID or #RIG_CONF_END if there is a lookup failure. * * \sa amp_ext_lookup() */ diff --git a/src/rig.c b/src/rig.c index cecfa78d0..e568402f8 100644 --- a/src/rig.c +++ b/src/rig.c @@ -6893,8 +6893,8 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status) * \param rig The rig handle * \param status The location where to store the current status * - * Retrieve the status of the radio. See RIG_POWER_ON, RIG_POWER_OFF and - * RIG_POWER_STANDBY defines for the \a status. + * Retrieve the status of the radio. See #RIG_POWER_ON, #RIG_POWER_OFF and + * #RIG_POWER_STANDBY defines for the \a status. * * \return RIG_OK if the operation has been successful, otherwise * a negative value if an error occurred (in which case, cause is diff --git a/src/rot_ext.c b/src/rot_ext.c index 0d7c34a32..63915b7ed 100644 --- a/src/rot_ext.c +++ b/src/rot_ext.c @@ -362,7 +362,7 @@ const struct confparams *HAMLIB_API rot_ext_lookup_tok(ROT *rot, * \note As this function calls rot_ext_lookup(), it can be considered a * higher level API. * - * \return The token ID or RIG_CONF_END if there is a lookup failure. + * \return The token ID or #RIG_CONF_END if there is a lookup failure. * * \sa rot_ext_lookup() */ commit bd5ed18bddbef070b893ed278c6e12d6706739f3 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Apr 30 19:00:33 2025 +0200 Add documentation for RIG_CONF_END Fixes: warning: explicit link request to 'RIG_CONF_END' could not be resolved diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index a8065a05a..1e3486ef1 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -861,11 +861,10 @@ typedef enum { typedef long hamlib_token_t; #define token_t hamlib_token_t - -//! @cond Doxygen_Suppress +/** + * \brief configuration token not found + */ #define RIG_CONF_END 0 -//! @endcond - /** * \brief parameter types commit c1788e2cf86edfad398ff6eb7e7e5389cc58cf66 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Apr 30 18:39:57 2025 +0200 Fix names of parameters in Doxygen comments diff --git a/src/misc.c b/src/misc.c index 3bba193fa..091655dca 100644 --- a/src/misc.c +++ b/src/misc.c @@ -339,7 +339,7 @@ double morse_code_dot_to_millis(int wpm) /** * \brief Convert duration of tenths of morse code dots to milliseconds at the given speed. - * \param tenths_of_dots number of 1/10ths of dots + * \param dot10ths number of 1/10ths of dots * \param wpm morse code speed in words per minute * \return int duration in milliseconds * @@ -1448,7 +1448,7 @@ const char *HAMLIB_API rig_stragclevel(enum agc_level_e level) /** * \brief Convert a enum agc_level_e to value - * \param integer... + * \param agcLevel level to convert * \return agc_level_e value */ value_t rig_valueagclevel(enum agc_level_e agcLevel) @@ -1468,7 +1468,7 @@ value_t rig_valueagclevel(enum agc_level_e agcLevel) /** * \brief Convert a value to agc_level_e -- constrains the range - * \param integer... + * \param agcValue value to convert * \return agc_level_e */ enum agc_level_e rig_levelagcvalue(int agcValue) @@ -1499,7 +1499,7 @@ enum agc_level_e rig_levelagcvalue(int agcValue) /** * \brief Convert AGC string... to agc_level_e - * \param mode AGC string... + * \param agcString AGC string to convert * \return agc_level_e */ enum agc_level_e rig_levelagcstr(const char *agcString) @@ -2358,7 +2358,8 @@ const char *HAMLIB_API rot_strstatus(rot_status_t status) /** * \brief Get pointer to rig function instead of using rig->caps - * \param RIG* and rig_function_e + * \param rig_model + * \param rig_function * \return the corresponding function pointer */ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_model, @@ -2650,7 +2651,8 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_model, /** * \brief Get integer/long instead of using rig->caps * watch out for integer values that may be negative -- if needed must change hamlib - * \param RIG* and rig_caps_int_e + * \param rig_model + * \param rig_caps * \return the corresponding long value -- -RIG_EINVAL is the only error possible */ uint64_t HAMLIB_API rig_get_caps_int(rig_model_t rig_model, @@ -2751,7 +2753,7 @@ static const struct /** * \brief Convert enum RIG_COMM_STATUS... to alpha string - * \param vfo RIG_COMM_STATUS_... + * \param status RIG_COMM_STATUS_... * \return alpha string */ const char *HAMLIB_API rig_strcommstatus(rig_comm_status_t status) commit 56b075ab452c92017a9a144c74dcebd5271c5fa3 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Wed Apr 30 16:21:08 2025 +0200 Fix Doxygen comment It is about the tpyedef, not the defines. diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index b9806b82b..a8065a05a 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -299,9 +299,9 @@ typedef struct s_rig RIG; * * Digitally-Coded Squelch codes are simple direct integers. */ +typedef unsigned int tone_t; #define CTCSS_LIST_SIZE 60 #define DCS_LIST_SIZE 128 -typedef unsigned int tone_t; /** commit 8feb174711bcc6756e46547837116499b80e2057 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Apr 29 19:35:23 2025 +0200 Fix typos diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 253f07231..b9806b82b 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -451,7 +451,7 @@ typedef enum { /** - * \brief Frequency type, + * \brief Frequency type * * Frequency type unit in Hz, able to hold SHF frequencies. */ @@ -2701,7 +2701,7 @@ typedef unsigned int rig_comm_status_t; * This struct contains live data, as well as a copy of capability fields * that may be updated (ie. customized) * - * It is NOT fine to move fields around as it can break share library offset + * It is NOT fine to move fields around as it can break shared library offset * As of 2024-03-03 freq_event_elapsed is the last known item being reference externally * So any additions or changes to this structure must be at the end of the structure */ @@ -2739,7 +2739,7 @@ struct rig_state { ann_t announces; /*!< Announces bit field list */ int preamp[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ - int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Attenuator list in dB, 0 terminated */ setting_t has_get_func; /*!< List of get functions */ setting_t has_set_func; /*!< List of set functions */ @@ -2939,7 +2939,7 @@ struct rig_state_deprecated { ann_t announces; /*!< Announces bit field list */ int preamp[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ - int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Attenuator list in dB, 0 terminated */ setting_t has_get_func; /*!< List of get functions */ setting_t has_set_func; /*!< List of set functions */ diff --git a/src/debug.c b/src/debug.c index 0e78b7b22..df8951ec0 100644 --- a/src/debug.c +++ b/src/debug.c @@ -325,7 +325,7 @@ vprintf_cb_t HAMLIB_API rig_set_debug_callback(vprintf_cb_t cb, rig_ptr_t arg) /** - * \brief Change the output stream from `stderr` a different stream. + * \brief Change the output stream from `stderr` to a different stream. * * \param stream The stream to direct debugging output. * commit 24eafbd2a4affe66e6cef0af38343652a4a54f09 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Tue Apr 29 08:54:56 2025 +0200 Fix Doxygen comment The description of hamlib_version was attached to hamlib_license and hamlib_license was missing the description. diff --git a/src/rig.c b/src/rig.c index 0e5aa74e7..cecfa78d0 100644 --- a/src/rig.c +++ b/src/rig.c @@ -74,6 +74,11 @@ #include "hamlibdatetime.h" #include "cache.h" +/** + * \brief Hamlib short license name + * + */ +const char *hamlib_license = "LGPL"; /** * \brief Hamlib release number * @@ -84,7 +89,6 @@ * the hamlib_version string. Changing the size provokes a warning from the * dynamic loader. */ -const char *hamlib_license = "LGPL"; //! @cond Doxygen_Suppress const char hamlib_version[21] = "Hamlib " PACKAGE_VERSION; #if INTPTR_MAX == INT128_MAX @@ -94,6 +98,7 @@ const char hamlib_version[21] = "Hamlib " PACKAGE_VERSION; #else #define ARCHBITS "32-bit" #endif +//! @endcond const char *hamlib_version2 = "Hamlib " PACKAGE_VERSION " " HAMLIBDATETIME " " ARCHBITS; HAMLIB_EXPORT_VAR(int) cookie_use; @@ -101,7 +106,6 @@ HAMLIB_EXPORT_VAR(int) skip_init; HAMLIB_EXPORT_VAR(int) lock_mode; // for use by rigctld HAMLIB_EXPORT_VAR(powerstat_t) rig_powerstat; // for use by both rigctld and rigctl -//! @endcond struct rig_caps caps_test; commit aeb827a2f1dab1d7a481e873890e8beee0ddb8ab Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Mon Apr 28 17:09:50 2025 +0200 Remove duplicated line diff --git a/bindings/ignore.swg b/bindings/ignore.swg index 25c570377..258b7677c 100644 --- a/bindings/ignore.swg +++ b/bindings/ignore.swg @@ -141,7 +141,6 @@ %ignore rig_mW2power; %ignore rig_get_resolution; %ignore rig_set_level; -%ignore rig_set_ext_level; %ignore rig_get_level; %ignore rig_set_parm; %ignore rig_get_parm; commit 3448c735b064dccd2aea26d5b15c9a30d06a1650 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Apr 27 18:56:43 2025 +0200 Remove non-working compilation instructions from comments Some instructions were a copy and paste error, some did not link to Hamlib. Compile all simulators with: make -C simulators check or compile a single simulator replacing "check" with the name of the simulator. Fixed with: perl -pe 's,// gcc.*\n,,' -i *.c perl -pe 's,// On mingw.*\n,,' -i *.c diff --git a/simulators/simatd578.c b/simulators/simatd578.c index 9790a78b6..5fe16fd0f 100644 --- a/simulators/simatd578.c +++ b/simulators/simatd578.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simatd578 simatd578.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simeasycomm.c b/simulators/simeasycomm.c index 09e4538f5..2a92869ba 100644 --- a/simulators/simeasycomm.c +++ b/simulators/simeasycomm.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simspid simspid.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simelecraft.c b/simulators/simelecraft.c index 20a10e081..9c52dc230 100644 --- a/simulators/simelecraft.c +++ b/simulators/simelecraft.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simelecraftk4.c b/simulators/simelecraftk4.c index 407f27da2..2e64bc8ee 100644 --- a/simulators/simelecraftk4.c +++ b/simulators/simelecraftk4.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft1000.c b/simulators/simft1000.c index 6b420077f..94f6d9c07 100644 --- a/simulators/simft1000.c +++ b/simulators/simft1000.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft1000 simft1000.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft450.c b/simulators/simft450.c index f314d9712..abee8b1c9 100644 --- a/simulators/simft450.c +++ b/simulators/simft450.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft710.c b/simulators/simft710.c index 95ab23b39..eeb80727c 100644 --- a/simulators/simft710.c +++ b/simulators/simft710.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft736.c b/simulators/simft736.c index c4a781152..1822bfc36 100644 --- a/simulators/simft736.c +++ b/simulators/simft736.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft897 simft897.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft747gx.c b/simulators/simft747gx.c index bc40e3d2a..b996c92bb 100644 --- a/simulators/simft747gx.c +++ b/simulators/simft747gx.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft747gx simft747gx.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft817.c b/simulators/simft817.c index 22d7d25fa..afc43c83d 100644 --- a/simulators/simft817.c +++ b/simulators/simft817.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft897 simft897.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft818.c b/simulators/simft818.c index 621b6e0c5..b0511728c 100644 --- a/simulators/simft818.c +++ b/simulators/simft818.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft847.c b/simulators/simft847.c index 424977a60..d73bea1a5 100644 --- a/simulators/simft847.c +++ b/simulators/simft847.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft897 simft897.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft897.c b/simulators/simft897.c index e78de3e61..8af0b36b9 100644 --- a/simulators/simft897.c +++ b/simulators/simft897.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft897 simft897.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simft990.c b/simulators/simft990.c index e3315dd69..06dca62a6 100644 --- a/simulators/simft990.c +++ b/simulators/simft990.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft990 simft990.c // emulates 1.2 ROM FT990 which can only read 1492 bytes #define _XOPEN_SOURCE 700 // since we are POSIX here we need this diff --git a/simulators/simft991.c b/simulators/simft991.c index 8b7ec9613..6d420ae9b 100644 --- a/simulators/simft991.c +++ b/simulators/simft991.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simftdx101.c b/simulators/simftdx101.c index 5abeea4aa..dc0b39532 100644 --- a/simulators/simftdx101.c +++ b/simulators/simftdx101.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simftdx1200.c b/simulators/simftdx1200.c index 96ac3b2f9..dac4e51f5 100644 --- a/simulators/simftdx1200.c +++ b/simulators/simftdx1200.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simftdx3000.c b/simulators/simftdx3000.c index 877cf4359..b81c88570 100644 --- a/simulators/simftdx3000.c +++ b/simulators/simftdx3000.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simftdx5000.c b/simulators/simftdx5000.c index 6b778aa65..4a843af01 100644 --- a/simulators/simftdx5000.c +++ b/simulators/simftdx5000.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic2730.c b/simulators/simic2730.c index e1e396acd..061fb45c0 100644 --- a/simulators/simic2730.c +++ b/simulators/simic2730.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic275.c b/simulators/simic275.c index b2edf63b6..8e8b16b80 100644 --- a/simulators/simic275.c +++ b/simulators/simic275.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7000.c b/simulators/simic7000.c index aa698e583..0e5e4c3c9 100644 --- a/simulators/simic7000.c +++ b/simulators/simic7000.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic705.c b/simulators/simic705.c index 326899aa8..0110780cf 100644 --- a/simulators/simic705.c +++ b/simulators/simic705.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7100.c b/simulators/simic7100.c index fe5399edb..fb5c3191e 100644 --- a/simulators/simic7100.c +++ b/simulators/simic7100.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7200.c b/simulators/simic7200.c index 4b7cc343c..ab4ea7bf6 100644 --- a/simulators/simic7200.c +++ b/simulators/simic7200.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7300.c b/simulators/simic7300.c index c807fd899..4f16f65de 100644 --- a/simulators/simic7300.c +++ b/simulators/simic7300.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7600.c b/simulators/simic7600.c index 61f5af61f..d506d0391 100644 --- a/simulators/simic7600.c +++ b/simulators/simic7600.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7610.c b/simulators/simic7610.c index 855f7a076..8f55e660c 100644 --- a/simulators/simic7610.c +++ b/simulators/simic7610.c @@ -1,8 +1,5 @@ // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7700.c b/simulators/simic7700.c index 892b19ff7..2279c64da 100644 --- a/simulators/simic7700.c +++ b/simulators/simic7700.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic7851.c b/simulators/simic7851.c index a48550663..8fa9aa992 100644 --- a/simulators/simic7851.c +++ b/simulators/simic7851.c @@ -1,8 +1,5 @@ // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic905.c b/simulators/simic905.c index f16a87a4a..9afe9968c 100644 --- a/simulators/simic905.c +++ b/simulators/simic905.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic910.c b/simulators/simic910.c index e4bee9ae1..9778fada3 100644 --- a/simulators/simic910.c +++ b/simulators/simic910.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic9100.c b/simulators/simic9100.c index 102f8d7e1..6917ac8ea 100644 --- a/simulators/simic9100.c +++ b/simulators/simic9100.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simic9700.c b/simulators/simic9700.c index 575497f02..600b1043e 100644 --- a/simulators/simic9700.c +++ b/simulators/simic9700.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simicgeneric.c b/simulators/simicgeneric.c index 9f6994357..b3e8947bf 100644 --- a/simulators/simicgeneric.c +++ b/simulators/simicgeneric.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simicr8600.c b/simulators/simicr8600.c index 74b32a617..0c55061fa 100644 --- a/simulators/simicr8600.c +++ b/simulators/simicr8600.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simid5100.c b/simulators/simid5100.c index f2345e86f..eb36e3fdc 100644 --- a/simulators/simid5100.c +++ b/simulators/simid5100.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simjupiter.c b/simulators/simjupiter.c index 392bb3a06..f4a383ebc 100644 --- a/simulators/simjupiter.c +++ b/simulators/simjupiter.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simft897 simft897.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simkenwood.c b/simulators/simkenwood.c index 70a5d14d2..7c865ee8c 100644 --- a/simulators/simkenwood.c +++ b/simulators/simkenwood.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simmicom.c b/simulators/simmicom.c index 5e44d0511..76aef1e0e 100644 --- a/simulators/simmicom.c +++ b/simulators/simmicom.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simspid simspid.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simorion.c b/simulators/simorion.c index 577de1fae..cbb11edb7 100644 --- a/simulators/simorion.c +++ b/simulators/simorion.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simorion simorion.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simpmr171.c b/simulators/simpmr171.c index a50c5aca8..cc3c9cc4d 100644 --- a/simulators/simpmr171.c +++ b/simulators/simpmr171.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simprm171 simprm171.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simpowersdr.c b/simulators/simpowersdr.c index f64e70bfe..189270e5d 100644 --- a/simulators/simpowersdr.c +++ b/simulators/simpowersdr.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simqrplabs.c b/simulators/simqrplabs.c index ad37449a1..04c203300 100644 --- a/simulators/simqrplabs.c +++ b/simulators/simqrplabs.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simrotorez.c b/simulators/simrotorez.c index 6f380d345..d1688a9b3 100644 --- a/simulators/simrotorez.c +++ b/simulators/simrotorez.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simspid simspid.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simspid.c b/simulators/simspid.c index 7dd304ecb..b0783adf0 100644 --- a/simulators/simspid.c +++ b/simulators/simspid.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simspid simspid.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simtmd700.c b/simulators/simtmd700.c index 24779ac30..2e6876a37 100644 --- a/simulators/simtmd700.c +++ b/simulators/simtmd700.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simtmd710.c b/simulators/simtmd710.c index 53e82877f..2ee48c76c 100644 --- a/simulators/simtmd710.c +++ b/simulators/simtmd710.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simtrusdx.c b/simulators/simtrusdx.c index 0cc8950e9..991c2bb99 100644 --- a/simulators/simtrusdx.c +++ b/simulators/simtrusdx.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simts450.c b/simulators/simts450.c index 1e279ee8f..ccb24b23a 100644 --- a/simulators/simts450.c +++ b/simulators/simts450.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simts590.c b/simulators/simts590.c index 08451ce0a..abb894007 100644 --- a/simulators/simts590.c +++ b/simulators/simts590.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simts890.c b/simulators/simts890.c index 61f9ad745..597d19054 100644 --- a/simulators/simts890.c +++ b/simulators/simts890.c @@ -1,6 +1,5 @@ //#define TRACE /* Full traffic trace if enabled */ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simts890 -l hamlib simts890.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simts950.c b/simulators/simts950.c index 886bbc89d..2218dbd51 100644 --- a/simulators/simts950.c +++ b/simulators/simts950.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simts990.c b/simulators/simts990.c index 671d8a5c3..1b2c93fbf 100644 --- a/simulators/simts990.c +++ b/simulators/simts990.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simxiegug90.c b/simulators/simxiegug90.c index 2aabcda85..3d27a00b1 100644 --- a/simulators/simxiegug90.c +++ b/simulators/simxiegug90.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simxiegux108g.c b/simulators/simxiegux108g.c index 42ac62fa9..1a0c7bd41 100644 --- a/simulators/simxiegux108g.c +++ b/simulators/simxiegux108g.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simxiegux6100.c b/simulators/simxiegux6100.c index ec61e15dd..4fe96854c 100644 --- a/simulators/simxiegux6100.c +++ b/simulators/simxiegux6100.c @@ -1,9 +1,6 @@ // simicom will show the pts port to use for rigctl on Unix // using virtual serial ports on Windows is to be developed yet // Needs a lot of improvement to work on all Icoms -// gcc -g -Wall -o simicom simicom.c -lhamlib -// On mingw in the hamlib src directory -// gcc -static -I../include -g -Wall -o simicom simicom.c -L../../build/src/.libs -lhamlib -lwsock32 -lws2_32 #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 diff --git a/simulators/simyaesu.c b/simulators/simyaesu.c index b4c92295d..09baaf0c4 100644 --- a/simulators/simyaesu.c +++ b/simulators/simyaesu.c @@ -1,5 +1,4 @@ // can run this using rigctl/rigctld and socat pty devices -// gcc -o simyaesu simyaesu.c #define _XOPEN_SOURCE 700 // since we are POSIX here we need this #if 0 commit 037c4953ed1f7d3b31b2c09d48dbf9e79210b8b1 Author: Daniele Forsi IU5HKX <iu...@gm...> Date: Sun Apr 27 18:36:58 2025 +0200 Fix name of function in error messages Fixed with: perl -pe s/pstname/ptsname/ -i *.c diff --git a/simulators/simatd578.c b/simulators/simatd578.c index 02bfb6f0a..9790a78b6 100644 --- a/simulators/simatd578.c +++ b/simulators/simatd578.c @@ -82,7 +82,7 @@ int openPort(char *comport) // doesn't matter for using pts devices if (name == NULL) { - perror("pstname"); + perror("ptsname"); return -1; } diff --git a/simulators/simeasycomm.c b/simulators/simeasycomm.c index 34a1430e9..09e4538f5 100644 --- a/simulators/simeasycomm.c +++ b/simulators/simeasycomm.c @@ -67,7 +67,7 @@ int openPort(char *comport) // doesn't matter for using pts devices if (name == NULL) { - perror("pstname"); + perror("ptsname"); return -1; } diff --git a/simulators/simelecraft.c b/simulators/simelecraft.c index c1abded7a..20a10e081 100644 --- a/simulators/simelecraft.c +++ b/simulat... [truncated message content] |