[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-56-g298a1be1
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: Michael B. <mdb...@us...> - 2020-07-24 14:04: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 298a1be19acbce66681597703430e77432c874d6 (commit) via 0ed89a77c89f31f5e85a35c3cecca818752e3f0c (commit) via 5be146cb2f5c9ffaf15eba8ca6573d46e709cce9 (commit) via 238d90ab06d9a1b133590e2e81eb0d6852dda73d (commit) via a507bfec80c92ae36702a2a08f9003467cc1d233 (commit) via d7b332c3f7d28573aec2a234d3c40ee6b7f000a0 (commit) from f133483dd8d6946e185bb00b1c0d1c8cbefbed5b (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 298a1be19acbce66681597703430e77432c874d6 Merge: 0ed89a77 5be146cb Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 24 08:52:29 2020 -0500 Merge branch 'master' of https://github.com/Hamlib/Hamlib commit 0ed89a77c89f31f5e85a35c3cecca818752e3f0c Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 24 08:52:21 2020 -0500 Remove time() from date_strget as monotonicity was broken using this diff --git a/src/debug.c b/src/debug.c index edf94112..76e0f2ef 100644 --- a/src/debug.c +++ b/src/debug.c @@ -149,12 +149,10 @@ void HAMLIB_API rig_set_debug_time_stamp(int flag) char *date_strget(char *buf, int buflen) { char tmp[16]; - time_t mytime; struct tm *mytm; struct timeval tv; - mytime = time(NULL); - mytm = gmtime(&mytime); gettimeofday(&tv, NULL); + mytm = gmtime(&tv.tv_sec); strftime(buf, buflen, "%Y-%m-%d:%H:%M:%S.", mytm); sprintf(tmp, "%06ld", (long)tv.tv_usec); strcat(buf, tmp); commit 5be146cb2f5c9ffaf15eba8ca6573d46e709cce9 Merge: f133483d 238d90ab Author: Michael Black <mdb...@ya...> Date: Fri Jul 24 08:50:59 2020 -0500 Merge pull request #351 from dforsi/fix/fix-typos Fix/fix typos commit 238d90ab06d9a1b133590e2e81eb0d6852dda73d Author: Daniele Forsi <df...@gm...> Date: Fri Jul 24 08:26:40 2020 +0200 Fix more spelling errors Fixed by hand. diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index cfe40577..0ec2f0ed 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -6321,7 +6321,7 @@ int newcat_get_vfo_mode(RIG *rig, vfo_t *vfo_mode) /* - * Writed data and waits for response + * Writes data and waits for response * input: complete CAT command string including termination in cmd_str * output: complete CAT command answer string in ret_data * return: RIG_OK or error diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index bce8bcd9..b842eecc 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -68,20 +68,20 @@ struct meade_priv_data * Serial Cable. * * | Command | Attribute | Return value | Description | - * -------------------------------------------------------------------- - * | :Me# | - | - | Moves telescope east | - * | :Mn# | - | - | Moves telescope north | - * | :Ms# | - | - | Moves telescope south | - * | :Mw# | - | - | Moves telescope west | - * | :AL# | - | - | Set to Land mode | - * | :Sz DDD*MM# | D,M | 1' == OK | Set Target azimuth | - * | :SasDD*MM# | s,D,M | 1' == OK | Set Target elevation | - * | :Mw# | - | - | Moves telescope west | - * | :Q# | - | - | Halt all slewing | - * | :SoDD# | D | '1' == OK | Set minimal elevation | - * | :ShDD# | D | '1' == OK | Set maximal elevation | - * | :MA# | - | '0' == OK | GoTo Target | - * | :D# | - | 0x7F == YES | Check if active movement | + * --------------------------------------------------------------------- + * | :Me# | - | - | Moves telescope east | + * | :Mn# | - | - | Moves telescope north | + * | :Ms# | - | - | Moves telescope south | + * | :Mw# | - | - | Moves telescope west | + * | :AL# | - | - | Set to Land mode | + * | :Sz DDD*MM# | D,M | 1' == OK | Set Target azimuth | + * | :SasDD*MM# | s,D,M | 1' == OK | Set Target elevation | + * | :Mw# | - | - | Moves telescope west | + * | :Q# | - | - | Halt all slewing | + * | :SoDD# | D | '1' == OK | Set minimal elevation | + * | :ShDD# | D | '1' == OK | Set maximal elevation | + * | :MA# | - | '0' == OK | GoTo Target | + * | :D# | - | 0x7F == YES | Check if active movement | * */ commit a507bfec80c92ae36702a2a08f9003467cc1d233 Author: Daniele Forsi <df...@gm...> Date: Fri Jul 24 09:06:37 2020 +0200 Fix more spelling errors As the previous commit, but adding --interactive=2 and ba codespell --write-changes --interactive=2 --summary --skip=*.m4 --ignore-words-list="ba,develope,get's,quitt,setts,som,ue,vektor" diff --git a/rigs/icom/optoscan.c b/rigs/icom/optoscan.c index 86484836..da37e6cd 100644 --- a/rigs/icom/optoscan.c +++ b/rigs/icom/optoscan.c @@ -788,7 +788,7 @@ static int optoscan_send_freq(RIG *rig, pltstate_t *state) /* read echo'd chars only...there will be no ACK from this command * * Note: - * It may have waited fro pltstate->usleep_time before reading the echo'd + * It may have waited for pltstate->usleep_time before reading the echo'd * chars, but the read will be blocking anyway. --SF * */ return icom_transaction(rig, C_CTL_MISC, S_OPTO_NXT, buff, 6, NULL, NULL); diff --git a/rigs/kenwood/README.ts2k b/rigs/kenwood/README.ts2k index cbc92a6d..acbfecac 100644 --- a/rigs/kenwood/README.ts2k +++ b/rigs/kenwood/README.ts2k @@ -25,7 +25,7 @@ File change summary: (Hopefully, I'll keep this updated...) Makefile.am Added ts2k.c, ts2k.h ts2k.status current status in the form of rigctl help - Takes alot of time. May or may not be kept + Takes a lot of time. May or may not be kept up to date. Anybody write an expect script? ts2k.c New ts2k_menu.c (not implemented; work to allow menus to set the diff --git a/rigs/tentec/jupiter.c b/rigs/tentec/jupiter.c index f0148a13..eecb4697 100644 --- a/rigs/tentec/jupiter.c +++ b/rigs/tentec/jupiter.c @@ -1103,7 +1103,7 @@ int tt538_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) * |__|__|__| (a 3 bit value, 0 - 7 indicating NB "strength" * 4 2 1 * - * Apparently the "ON" / "OFF" state ot the NB is NOT available for reading. This + * Apparently the "ON" / "OFF" state of the NB is NOT available for reading. This * state is visible in the Jupiter's menu. Hamlib does not support a "level" for * NB. We only recognize zero (off) or non-zero (on) for this function on read. */ diff --git a/rotators/meade/meade.c b/rotators/meade/meade.c index 03bab098..bce8bcd9 100644 --- a/rotators/meade/meade.c +++ b/rotators/meade/meade.c @@ -60,7 +60,7 @@ struct meade_priv_data * Not the full set of available commands is used, the list here shows * only the commands of the telescope used by hamlib * - * All used Commands are supportet by Meade Telescopes with LX-200 protocol + * All used Commands are supported by Meade Telescopes with LX-200 protocol * (e.g. DS-2000 with Autostar) and should also work with the LX16 and * LX200GPS. * Tested only with DS-2000 and AutoStar 494 together with Meade 506 i2c to @@ -398,7 +398,7 @@ static int meade_park(ROT *rot) } /* - * Reset: Nothing to do exept parking + * Reset: Nothing to do except parking */ static int meade_reset(ROT *rot, rot_reset_t reset) { commit d7b332c3f7d28573aec2a234d3c40ee6b7f000a0 Author: Daniele Forsi <df...@gm...> Date: Fri Jul 24 09:02:12 2020 +0200 Fix spelling errors Fixed using the following command: codespell --write-changes --summary --skip=*.m4 --ignore-words-list="develope,get's,quitt,setts,som,ue,vektor" codespell --write-changes --summary --skip=aclocal.m4,lib --ignore-words-list="develope,get's,quitt,setts,som,ue,vektor" Codespell home page: https://github.com/codespell-project/codespell diff --git a/INSTALL b/INSTALL index e1aef730..81b451bf 100644 --- a/INSTALL +++ b/INSTALL @@ -317,7 +317,7 @@ non-default --prefix is passed to 'configure', the 'lappend' line in tcltest.tcl script will need to be modified accordingly so the script can load the Hamlib package. As TCL doesn't seem to have a "standard" location for additional packages and since there seemed to be no common location among distributions, -this path was chosen abitrarily. Any patches to improve installation path +this path was chosen arbitrarily. Any patches to improve installation path discovery of local packages are welcome. Lua binding will be installed into $(libdir)/lua/$(LUA_VERSION) (default). diff --git a/NEWS b/NEWS index b36d773a..6ac54b6f 100644 --- a/NEWS +++ b/NEWS @@ -62,7 +62,7 @@ Version 3.2 * New Flrig backend, Mike, W9MDB * New model, IC-M710, Mike, W9MDB * Build instructions and test script for Python3 - * Rename autogen.sh to bootsrap and don't call configure + * Rename autogen.sh to bootstrap and don't call configure * micro-ham support. Christoph, DL1YCF * New rotator, SPID MD-01/02 in ROT2 mode, Norvald Ryeng, LA6YKA * New model, Flex 6400/6600, Mike, W9MDB @@ -378,13 +378,13 @@ Version 1.2.0 - locator and dec/dms interface rework - bump library CURRENT version info * new backends: Lowe (HF-235), FlexRadio (SDR-1000), - skelton TAPR (DSP-10), skelton RFT, + skeleton TAPR (DSP-10), skeleton RFT, Ten-Tec models and many new models & fixes * new rotator backends: sartek * frontend: emulated transceive mode using polling * icom: implemented retry, esp. useful for CI-V * icom: pipelined tuning on Optoscan's - * microtune: no need of root priviledges anymore + * microtune: no need of root privileges anymore * bindings: added Python, new install method (perl is installed in $prefix) * rigmem: new command to load/store memory content from/to XML file * port: NetBSD & FreeBSD, mingw32(Windows) port, MacOSX ready diff --git a/PLAN b/PLAN index 2ce15616..d22b25b5 100644 --- a/PLAN +++ b/PLAN @@ -83,7 +83,7 @@ o available "set mode" items (ie. rig setup), and provide a way to modify them o DSP ? o max memory channel -o per rig timeout/retry (can be overriden) +o per rig timeout/retry (can be overridden) o Write some memory channel handling (name, mode, freq/vfo, duplex, split, ..) Any other ideas? diff --git a/README.betatester b/README.betatester index 622f2330..7d091772 100644 --- a/README.betatester +++ b/README.betatester @@ -64,7 +64,7 @@ The advantage of the Git snapshot is that you won't need as many tools installed to build Hamlib as the work of the GNU Build System has already been done. Most of the other packages listed below will be needed. If you tell the 'configure' script to build certain parts of Hamlib like -documentation or scripting language bindings the relavent optional packages +documentation or scripting language bindings the relevant optional packages will be needed. See 'configure --help' for more information. Here is a list of development packages needed for a complete build of the diff --git a/README.developer b/README.developer index 140c068a..1c57945b 100644 --- a/README.developer +++ b/README.developer @@ -181,7 +181,7 @@ the hamlib-developer mailing list. See section 8.3. One of the most powerful features of Git is its ability to make working with branches easy. It also allows the developers to "cherry pick" patches from the master development branch into stable release branches. In this manner -we can accomodate patches submitted against a stable release and merge them +we can accommodate patches submitted against a stable release and merge them into master as well. Such parallel development is a new feature for our project and there will be a learning curve! @@ -513,11 +513,11 @@ So far, Hamlib has been tested successfully under the following systems: Note: The '.' character is a Git wildcard that includes all new and modified files in your working tree. - The '-m' option may be ommitted, in which case Git will start + The '-m' option may be omitted, in which case Git will start your default editor for a longer commit message. Commit messages generally have the form of a short subject line, then a blank line, and then as much text (broken into paragraphs as - needed) as needed for a good decription of the commit. + needed) as needed for a good description of the commit. Assuming your working tree was cloned from the SF.net repository or N0NB's GitHub repository, you can now issue a pull request @@ -722,7 +722,7 @@ the rules hereunder: * Touching the frontend (files in src/ and include/hamlib) always requires discussion beforehand on the hamlib-developer list. * Announce on the hamlib-developer list if you're about to do serious - maintainance work + maintenance work Thanks for contributing and have fun! diff --git a/README.release b/README.release index acc11410..d661fdc6 100644 --- a/README.release +++ b/README.release @@ -69,11 +69,11 @@ remote repository, "origin"): ABI_REVISION, and ABI_AGE are set in configure.ac. ABI_VERSION should be advanced when the ABI is affected by changes in the library interface. ABI_REVISION is the revision and indicates source changes in Hamlib but no - change in ABI. ABI_AGE reflects backward compatibity to a previous version. + change in ABI. ABI_AGE reflects backward compatibility to a previous version. Per the libtool manual, this value is subtracted from ABI_VERSION to note compatible prior versions. Per the libtool manual, so long as the library interface is added to and nothing is removed or changed, backward - compatibity should exist. When the API is changed, ABI_VERSION will be + compatibility should exist. When the API is changed, ABI_VERSION will be advanced, ABI_REVISION will be reset to 0, and ABI_AGE may be advanced pending API/ABI changes. @@ -113,7 +113,7 @@ See README.build-win32 for information on prerequisites, etc. * Build Windows DLL with stdcall convention (script in progress): Ditto but with HAMLIB_API set to __stdcall in include/hamlib/rig_dll.h before re-compiling. - Subsitute cdecl by stdcall in README.txt. + Substitute cdecl by stdcall in README.txt. * Release the file(s) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 682f7385..a3b590f6 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -157,7 +157,7 @@ hamlibtcl_la_DATA = pkgIndex.tcl # set by $(hamlibtcl_ladir) hamlibtcl_la_LTLIBRARIES = $(tcl_ltlib) -# Having the first occurance of 'hamlib' capitalized seemed to cause confusion +# Having the first occurrence of 'hamlib' capitalized seemed to cause confusion # for the TCL interpreter loading the Hamlib module. pkgIndex.tcl: Makefile $(AM_V_at)echo 'package ifneeded hamlib $(PKG_VER) [list load [file join $$dir $(DLL)] Hamlib]' > pkgIndex.tcl diff --git a/bindings/README.python b/bindings/README.python index 10f36e28..38fe157b 100644 --- a/bindings/README.python +++ b/bindings/README.python @@ -31,7 +31,7 @@ the main source directory. Adjust your paths accordingly. Adjust your --prefix option as needed (installation to the user's home directory is shown to avoid root privileges). -Asssuming that Python2 is the default installed Python interpreter, build +Assuming that Python2 is the default installed Python interpreter, build its bindings first: ../hamlib/configure --with-python-binding --prefix=$HOME/local @@ -154,7 +154,7 @@ paths separated by colons. In this case, if PYTHONPATH was already set the new path is prepended to its prior setting. While setting the environment variable is good for a one-off run, a more -permanent solution can be acheived by placing a file that ends in .pth in a +permanent solution can be achieved by placing a file that ends in .pth in a directory that Python will process when starting. The special place is: ~/.local/lib64/python3.6/site-packages diff --git a/configure.ac b/configure.ac index e650f08d..05098a62 100644 --- a/configure.ac +++ b/configure.ac @@ -307,7 +307,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[struct{char a;int b;}s[8]={[3]={.b=5}};]])], [AC_MSG_RESULT(yes)], [AC_MSG_ERROR(["" -"You need a C99 compliant C compiler that supports struct/array intializers." +"You need a C99 compliant C compiler that supports struct/array initializers." "Have you considered GCC lately?."]) ]) diff --git a/cppcheck.sh b/cppcheck.sh index a73f6fbd..ef58eb4e 100755 --- a/cppcheck.sh +++ b/cppcheck.sh @@ -2,7 +2,7 @@ # Author Michael Black W9MDB # This SUPPRESS setting results in no warnings as of 2020-01-14 -# There are things that could still be done...especialy in the C++ area +# There are things that could still be done...especially in the C++ area echo "See cppcheck.log when done" echo "There should be no errors or warnings" echo "This takes several hours to run" diff --git a/doc/README.man-pages b/doc/README.man-pages index 88434b3d..cfd5eec5 100644 --- a/doc/README.man-pages +++ b/doc/README.man-pages @@ -12,7 +12,7 @@ make up the roff system. Documentation written in roff can be transformed into a number of formats for final publication. For the Hamlib project, the output formats are the classic man(1) format to a terminal screen, HTML, and PDF. While groff includes a -number of macro pacakges suitable for a variety of document styles, Hamlib +number of macro packages suitable for a variety of document styles, Hamlib source files are written using the man(7) macro package. The layout of Hamlib man pages generally follow the format specified in man-pages(7). The macros used in the man pages format is specified in groff_man(7). diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1 index 9007909d..5813636a 100644 --- a/doc/man1/rigctld.1 +++ b/doc/man1/rigctld.1 @@ -313,7 +313,7 @@ below). . .TP .BR \-X ", " \-\-twiddle = \fIseconds\fP -Enables timeout when VFO twiddling is detected. Some functons will be ignored. +Enables timeout when VFO twiddling is detected. Some functions will be ignored. .IP Should only be needed when controlling software should be "paused" .B -v diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index 89a5dd32..b51a62c1 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -548,7 +548,7 @@ static int netrigctl_open(RIG *rig) } else { - // not an error -- just a warning for backward compatibily + // not an error -- just a warning for backward compatibility rig_debug(RIG_DEBUG_ERR, "%s: unknown setting='%s'\n", __func__, buf); } } @@ -625,7 +625,7 @@ static int netrigctl_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) char cmd[CMD_MAX]; char buf[BUF_MAX]; char vfostr[6] = ""; -#if 0 // disable until we figure out if we can do this without breaking backwards compability +#if 0 // disable until we figure out if we can do this without breaking backwards compatibility char vfotmp[16]; #endif @@ -2231,7 +2231,7 @@ struct rig_caps netrigctl_caps = .timeout = 1000, /* enough for the worst rig we have */ .retry = 5, /* 5 seconds total */ - /* following fields updated in rig_state at openning time */ + /* following fields updated in rig_state at opening time */ .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, .has_get_level = RIG_LEVEL_NONE, diff --git a/dummy/trxmanager.c b/dummy/trxmanager.c index d6c6baeb..51fa9d0e 100644 --- a/dummy/trxmanager.c +++ b/dummy/trxmanager.c @@ -67,7 +67,7 @@ #define FLRIG_MODE_PKTFM 'E' #define FLRIG_MODE_PKTAM 'F' // Hamlib doesn't support D2/D3 modes in hamlib yet -// So we define them here but they aren't implmented +// So we define them here but they aren't implemented #define FLRIG_MODE_PKTLSB2 'G' #define FLRIG_MODE_PKTUSB2 'H' #define FLRIG_MODE_PKTFM2 'I' diff --git a/extra/gnuradio/gnuradio.cc b/extra/gnuradio/gnuradio.cc index dc3f4d4e..5fdc97ae 100644 --- a/extra/gnuradio/gnuradio.cc +++ b/extra/gnuradio/gnuradio.cc @@ -220,7 +220,7 @@ static void *gnuradio_process(void *arg) priv = (struct gnuradio_priv_data*)rig->state.priv; - /* the mutex lock is not to gurantee reentrancy of rig_debug, + /* the mutex lock is not to guarantee reentrancy of rig_debug, * this is just to know when backend want us start running */ pthread_mutex_lock(&priv->mutex_process); diff --git a/extra/kylix/HamlibComponents.pas b/extra/kylix/HamlibComponents.pas index 1ad1286f..9e029bd0 100644 --- a/extra/kylix/HamlibComponents.pas +++ b/extra/kylix/HamlibComponents.pas @@ -115,7 +115,7 @@ constructor TRotatorComponent.CreateRotator(AOwner: TComponent; AModel: rot_mode begin inherited Create(AOwner); - {* Initialize the library for the spesified model *} + {* Initialize the library for the specified model *} FRot := rot_init(AModel); if (FRot = nil) then raise ERotatorException.Create('Rig initialization error'); @@ -291,7 +291,7 @@ constructor TRigComponent.CreateRig(AOwner: TComponent; AModel: integer); begin inherited Create(AOwner); - {* Initialize the library for the spesified model *} + {* Initialize the library for the specified model *} FRig := rig_init(AModel); if (FRig = nil) then raise ERigException.Create('Rig initialization error'); diff --git a/extra/kylix/hamlib_rigapi.pas b/extra/kylix/hamlib_rigapi.pas index 4db8471e..4a42bc2b 100644 --- a/extra/kylix/hamlib_rigapi.pas +++ b/extra/kylix/hamlib_rigapi.pas @@ -25,7 +25,7 @@ const {* * Error codes that can be returned by the Hamlib functions *} - RIG_OK = 0; {* completed sucessfully *} + RIG_OK = 0; {* completed successfully *} RIG_EINVAL = 1; {* invalid parameter *} RIG_ECONF = 2; {* invalid configuration (serial,..) *} RIG_ENOMEM = 3; {* memory shortage *} @@ -81,7 +81,7 @@ type * Basic rig type, can store some useful * info about different radios. Each lib must * be able to populate this structure, so we can make - * useful enquiries about capablilities. + * useful enquiries about capabilities. *} rig_port_e = ( RIG_PORT_NONE = 0, {* as bizarre as it could be :) *} @@ -663,7 +663,7 @@ type {* Basic rig type, can store some useful * info about different radios. Each lib must * be able to populate this structure, so we can make - * useful enquiries about capablilities. + * useful enquiries about capabilities. *} {* diff --git a/extra/kylix/hamlib_rotapi.pas b/extra/kylix/hamlib_rotapi.pas index 4d04be8f..c94d0be6 100644 --- a/extra/kylix/hamlib_rotapi.pas +++ b/extra/kylix/hamlib_rotapi.pas @@ -31,7 +31,7 @@ type rot_model_t = integer; rot_reset_t = integer; - PRot = ^TRot; // forward decleration + PRot = ^TRot; // forward declaration rot_caps = packed record rot_model : rot_model_t; diff --git a/extra/kylix/tests/HamlibRadioForm.pas b/extra/kylix/tests/HamlibRadioForm.pas index 3e5ce1b5..ef72f85b 100644 --- a/extra/kylix/tests/HamlibRadioForm.pas +++ b/extra/kylix/tests/HamlibRadioForm.pas @@ -69,7 +69,7 @@ begin except on e: ERigException do begin - ShowMessage('Error occured while using the rig: %s', [e.Message]); + ShowMessage('Error occurred while using the rig: %s', [e.Message]); FRigComponent.CloseRig; FRigComponent.Free; end; @@ -114,7 +114,7 @@ end; procedure TRadioForm.MagicCheckButtonClick(Sender: TObject); begin if FRigComponent.checkMagic - then ShowMessage('Magic check succeded.') + then ShowMessage('Magic check succeeded.') else ShowMessage('Magic check FAILED!!!'); end; diff --git a/include/hamlib/amplifier.h b/include/hamlib/amplifier.h index 990df157..7d61cea8 100644 --- a/include/hamlib/amplifier.h +++ b/include/hamlib/amplifier.h @@ -136,7 +136,7 @@ enum amp_level_e /* Basic amp type, can store some useful info about different amplifiers. Each * lib must be able to populate this structure, so we can make useful - * enquiries about capablilities. + * enquiries about capabilities. */ /** diff --git a/include/hamlib/amplist.h b/include/hamlib/amplist.h index 8f1544d7..42808d83 100644 --- a/include/hamlib/amplist.h +++ b/include/hamlib/amplist.h @@ -61,7 +61,7 @@ * * The dummy backend, as the name suggests, is a backend which performs * no hardware operations and always behaves as one would expect. It can - * be thought of as a hardware simulator and is very usefull for testing + * be thought of as a hardware simulator and is very useful for testing * client applications. */ /** diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index b6d1a8d8..e919aa88 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -533,7 +533,7 @@ typedef enum { * \brief PTT status */ typedef enum { - RIG_PTT_OFF = 0, /*!< PTT desactivated */ + RIG_PTT_OFF = 0, /*!< PTT deactivated */ RIG_PTT_ON, /*!< PTT activated */ RIG_PTT_ON_MIC, /*!< PTT Mic only, fallbacks on RIG_PTT_ON if unavailable */ RIG_PTT_ON_DATA /*!< PTT Data (Mic-muted), fallbacks on RIG_PTT_ON if unavailable */ @@ -1920,13 +1920,13 @@ struct rig_cache { int timeout_ms; // the cache timeout for invalidating itself vfo_t vfo; freq_t freq; // to be deprecated - // othe abstraction here is based on dual vfo rigs and mapped to all others + // other abstraction here is based on dual vfo rigs and mapped to all others // So we have four possible states of rig // MainA, MainB, SubA, SubB // Main is the Main VFO and Sub is for the 2nd VFO // Most rigs have MainA and MainB // Dual VFO rigs can have SubA and SubB too - // For dual VFO rigs simplex opeations are all done on MainA/MainB -- ergo this abstraction + // For dual VFO rigs simplex operations are all done on MainA/MainB -- ergo this abstraction freq_t freqMainA; // VFO_A, VFO_MAIN, and VFO_MAINA freq_t freqMainB; // VFO_B, VFO_SUB, and VFO_MAINB freq_t freqSubA; // VFO_SUBA diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index 559aa160..6f1e8327 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -56,7 +56,7 @@ * * The dummy backend, as the name suggests, is a backend which performs no * hardware operations and always behaves as one would expect. It can be - * thought of as a hardware simulator and is very usefull for testing client + * thought of as a hardware simulator and is very useful for testing client * applications. * * It has also been expanded to provide support to "virtual" type of rigs @@ -327,7 +327,7 @@ /* * Radio Shack - * Actualy, they might be either Icom or Uniden. TBC --SF + * Actually, they might be either Icom or Uniden. TBC --SF */ #define RIG_RADIOSHACK 7 #define RIG_BACKEND_RADIOSHACK "radioshack" diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h index 9258b257..b577a477 100644 --- a/include/hamlib/rotator.h +++ b/include/hamlib/rotator.h @@ -186,7 +186,7 @@ typedef enum { * \def ROT_MOVE_CW * \brief A macro that returns the flag for the \b clockwise direction. * - * This macro defines the value of the \b clockwise direction wich can be + * This macro defines the value of the \b clockwise direction which can be * used with the rot_move() function. This value is equivalent to * ROT_MOVE_RIGHT . * @@ -198,7 +198,7 @@ typedef enum { /* Basic rot type, can store some useful info about different rotators. Each * lib must be able to populate this structure, so we can make useful - * enquiries about capablilities. + * enquiries about capabilities. */ /** diff --git a/include/hamlib/rotlist.h b/include/hamlib/rotlist.h index b629ed6b..4481c22f 100644 --- a/include/hamlib/rotlist.h +++ b/include/hamlib/rotlist.h @@ -66,7 +66,7 @@ * * The dummy backend, as the name suggests, is a backend which performs * no hardware operations and always behaves as one would expect. It can - * be thought of as a hardware simulator and is very usefull for testing + * be thought of as a hardware simulator and is very useful for testing * client applications. */ /** diff --git a/macros/ax_lua.m4 b/macros/ax_lua.m4 index 9feb3522..7607c5fe 100644 --- a/macros/ax_lua.m4 +++ b/macros/ax_lua.m4 @@ -82,7 +82,7 @@ # appropriate Automake primary, e.g. lua_SCRIPS or luaexec_LIBRARIES. # # If an acceptable Lua interpreter is found, then ACTION-IF-FOUND is -# performed, otherwise ACTION-IF-NOT-FOUND is preformed. If ACTION-IF-NOT- +# performed, otherwise ACTION-IF-NOT-FOUND is performed. If ACTION-IF-NOT- # FOUND is blank, then it will default to printing an error. To prevent # the default behavior, give ':' as an action. # diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c index 098f47c1..1e96dce7 100644 --- a/rigs/adat/adat.c +++ b/rigs/adat/adat.c @@ -567,7 +567,7 @@ static adat_cmd_list_t adat_cmd_list_recover_from_error = // --------------------------------------------------------------------------- -// IMPLEMEMTATION +// IMPLEMENTATION // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c index fb2ebc0c..97ab9bac 100644 --- a/rigs/alinco/dx77.c +++ b/rigs/alinco/dx77.c @@ -83,7 +83,7 @@ #define CMD_RDATA "3H" /* Current Data read */ #define CMD_RSPLT "3I" /* Split read */ #define CMD_RPOWER "3J" /* Transmitter Output read */ -#define CMD_RSELECT "3K" /* SELECT Postion read */ +#define CMD_RSELECT "3K" /* SELECT Position read */ #define DX77_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c index 2a5c8953..a10a6a22 100644 --- a/rigs/aor/ar7030.c +++ b/rigs/aor/ar7030.c @@ -154,19 +154,19 @@ static void setMemPtr(RIG *rig, int page, int address) { rxr_writeByte(rig, 0x50 + page); //Set Page - if (address <= 0xFF) //*** <= 8 Bit Adresse *** + if (address <= 0xFF) //*** <= 8 Bit Address *** { rxr_writeByte(rig, 0x30 + (address >> 4)); //Set H-Register 4 Bits rxr_writeByte(rig, 0x40 + (address & - 0x0F)); //Set Adress(12 Bits = (4 Bit H Register) + 8 Bit) + 0x0F)); //Set Address(12 Bits = (4 Bit H Register) + 8 Bit) } - else //*** > 8 Bit Adresse *** + else //*** > 8 Bit Address *** { rxr_writeByte(rig, 0x30 + ((address >> 4) & 0x0F)) ;//Set H-Register 4 Bits rxr_writeByte(rig, 0x40 + (address & - 0x0F)); //Set Adress(12 Bits = (4 Bit H Register) + 8 Bit) + 0x0F)); //Set Address(12 Bits = (4 Bit H Register) + 8 Bit) rxr_writeByte(rig, 0x10 + (address >> - 8)); //Set Adress high(12 Bits=(4 Bit H Register)+8 Bit) + 8)); //Set Address high(12 Bits=(4 Bit H Register)+8 Bit) } } diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c index 702099b2..aafce3c5 100644 --- a/rigs/aor/ar7030p_utils.c +++ b/rigs/aor/ar7030p_utils.c @@ -954,7 +954,7 @@ int bcd2Int(const unsigned char bcd) * * \param int Integer value (0-99) * - * \return 2 digit BCD equvalent (0-99), 0xff on failure + * \return 2 digit BCD equivalent (0-99), 0xff on failure */ unsigned char int2BCD(const unsigned int val) { @@ -1042,7 +1042,7 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm) } else { - step = 20; /* HACK - try and fix mimimum AGC readings */ + step = 20; /* HACK - try and fix minimum AGC readings */ } rig_debug(RIG_DEBUG_VERBOSE, "%s: got step size %d\n", __func__, step); diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c index c251a425..cf4c8d3b 100644 --- a/rigs/barrett/barrett.c +++ b/rigs/barrett/barrett.c @@ -429,7 +429,7 @@ int barrett_set_freq(RIG *rig, vfo_t vfo, freq_t freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s freq=%.0f\n", __func__, rig_strvfo(vfo), freq); - // If we are not explicity asking for VFO_B then we'll set the receive side also + // If we are not explicitly asking for VFO_B then we'll set the receive side also if (vfo != RIG_VFO_B) { char *response = NULL; @@ -765,7 +765,7 @@ int barrett_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } else { - rig_debug(RIG_DEBUG_ERR, "%s: unable to parse STRENGHT from %s\n", + rig_debug(RIG_DEBUG_ERR, "%s: unable to parse STRENGTH from %s\n", __func__, response); return -RIG_EPROTO; } diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c index 0fc86fa0..c86fb152 100644 --- a/rigs/drake/drake.c +++ b/rigs/drake/drake.c @@ -722,7 +722,7 @@ int drake_get_chan(RIG *rig, channel_t *chan, int read_only) return RIG_OK; } - //now decypher it + //now decipher it retval = drake_transaction(rig, "RA" EOM, 3, mdbuf, &mdbuf_len); if (retval != RIG_OK) diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c index 581b262b..56a65060 100644 --- a/rigs/drake/r8a.c +++ b/rigs/drake/r8a.c @@ -121,7 +121,7 @@ const struct rig_caps r8a_caps = .max_xit = Hz(0), .max_ifshift = Hz(0), .targetable_vfo = 0, - .transceive = RIG_TRN_OFF, /* TODO: acutally has RIG_TRN_RIG */ + .transceive = RIG_TRN_OFF, /* TODO: actually has RIG_TRN_RIG */ .bank_qty = 0, .chan_desc_sz = 7, .vfo_ops = R8A_VFO_OPS, diff --git a/rigs/drake/r8b.c b/rigs/drake/r8b.c index 178a10cc..65d3710a 100644 --- a/rigs/drake/r8b.c +++ b/rigs/drake/r8b.c @@ -121,7 +121,7 @@ const struct rig_caps r8b_caps = .max_xit = Hz(0), .max_ifshift = Hz(0), .targetable_vfo = 0, - .transceive = RIG_TRN_OFF, /* TODO: acutally has RIG_TRN_RIG */ + .transceive = RIG_TRN_OFF, /* TODO: actually has RIG_TRN_RIG */ .bank_qty = 0, .chan_desc_sz = 7, .vfo_ops = R8B_VFO_OPS, diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c index 5173fed6..b6d46d54 100644 --- a/rigs/elad/elad.c +++ b/rigs/elad/elad.c @@ -160,7 +160,7 @@ const struct confparams elad_cfg_params[] = * * returns: * RIG_OK - if no error occurred. - * RIG_EIO - if an I/O error occured while sending/receiving data. + * RIG_EIO - if an I/O error occurred while sending/receiving data. * RIG_ETIMEOUT - if timeout expires without any characters received. * RIG_REJECTED - if a negative acknowledge was received or command not * recognized by rig. @@ -431,7 +431,7 @@ transaction_quit: * expected Value of expected string length * * Returns: - * RIG_OK - if no error occured. + * RIG_OK - if no error occurred. * RIG_EPROTO if returned string and expected are not equal * Error from elad_transaction() if any * diff --git a/rigs/elad/elad.h b/rigs/elad/elad.h index 171831b8..f55f0cfb 100644 --- a/rigs/elad/elad.h +++ b/rigs/elad/elad.h @@ -77,7 +77,7 @@ struct elad_priv_data { int k2_md_rtty; /* K2 RTTY mode available flag, 1 = RTTY, 0 = N/A */ char *fw_rev; /* firmware revision level */ int trn_state; /* AI state discovered at startup */ - unsigned fw_rev_uint; /* firmware revison as a number 1.07 -> 107 */ + unsigned fw_rev_uint; /* firmware revision as a number 1.07 -> 107 */ char verify_cmd[4]; /* command used to verify set commands */ int is_emulation; /* flag for TS-2000 emulations */ void * data; /* model specific data */ diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c index 6c42bbef..84ac4196 100644 --- a/rigs/flexradio/dttsp.c +++ b/rigs/flexradio/dttsp.c @@ -192,7 +192,7 @@ const struct rig_caps dttsp_rig_caps = .transceive = RIG_TRN_OFF, .attenuator = { RIG_DBLST_END, }, .preamp = { RIG_DBLST_END, }, - /* In fact, RX and TX ranges are dependant on the tuner */ + /* In fact, RX and TX ranges are dependent on the tuner */ .rx_range_list1 = { { .startf = kHz(150), .endf = MHz(1500), .modes = DTTSP_MODES, .low_power = -1, .high_power = -1, DTTSP_VFO @@ -276,7 +276,7 @@ const struct rig_caps dttsp_udp_rig_caps = .transceive = RIG_TRN_OFF, .attenuator = { RIG_DBLST_END, }, .preamp = { RIG_DBLST_END, }, - /* In fact, RX and TX ranges are dependant on the tuner */ + /* In fact, RX and TX ranges are dependent on the tuner */ .rx_range_list1 = { { .startf = kHz(150), .endf = MHz(1500), .modes = DTTSP_MODES, .low_power = -1, .high_power = -1, DTTSP_VFO diff --git a/rigs/icmarine/icmarine.c b/rigs/icmarine/icmarine.c index d56a01e4..0d0233ed 100644 --- a/rigs/icmarine/icmarine.c +++ b/rigs/icmarine/icmarine.c @@ -234,7 +234,7 @@ int icmarine_get_conf(RIG *rig, token_t token, char *val) * We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL * * cmd: mandatory - * param: only 1 optional NMEA paramter, NULL for none (=query) + * param: only 1 optional NMEA parameter, NULL for none (=query) * response: optional (holding BUFSZ bytes) */ int icmarine_transaction(RIG *rig, const char *cmd, const char *param, @@ -258,7 +258,7 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param, rig_flush(&rs->rigport); - /* command formating */ + /* command formatting */ cmd_len = snprintf(cmdbuf, BUFSZ, "$PICOA,%02d,%02u,%s", CONTROLLER_ID, priv->remote_id, diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index bb91b2f9..4165206d 100644 --- a/rigs/icom/frame.c +++ b/rigs/icom/frame.c @@ -149,7 +149,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd, * read what we just sent, because TX and RX are looped, * and discard it... * - if what we read is not what we sent, then it means - * a collision on the CI-V bus occured! + * a collision on the CI-V bus occurred! * - if we get a timeout, then retry to send the frame, * up to rs->retry times. */ @@ -158,7 +158,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd, if (retval == -RIG_ETIMEOUT || retval == 0) { - /* Nothing recieved, CI-V interface is not echoing */ + /* Nothing received, CI-V interface is not echoing */ // cppcheck-suppress * Unhold_Decode(rig); return -RIG_BUSERROR; @@ -230,7 +230,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd, /* * wait for ACK ... - * FIXME: handle pading/collisions + * FIXME: handle padding/collisions * ACKFRMLEN is the smallest frame we can expect from the rig */ buf[0] = 0; diff --git a/rigs/icom/ic271.c b/rigs/icom/ic271.c index 7ad42b6e..751705c6 100644 --- a/rigs/icom/ic271.c +++ b/rigs/icom/ic271.c @@ -39,7 +39,7 @@ * IC-271 A/E * IC-271 H is high power (75W) * - * Independant transmit/receive + * Independent transmit/receive * * specs: http://www.qsl.net/sm7vhs/radio/icom/Ic271/specs.htm * diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c index d47f90e9..95ff4a26 100644 --- a/rigs/icom/ic703.c +++ b/rigs/icom/ic703.c @@ -177,11 +177,11 @@ const struct rig_caps ic703_caps = }, /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY | RIG_MODE_CWR | RIG_MODE_RTTYR, kHz(2.4)}, /* bultin FL-272 */ - {RIG_MODE_AM, kHz(9)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ - {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ bultin FL-23+SFPC455E */ - {RIG_MODE_FM, kHz(9)}, /* narrow w/ bultin FL-94 */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY | RIG_MODE_CWR | RIG_MODE_RTTYR, kHz(2.4)}, /* builtin FL-272 */ + {RIG_MODE_AM, kHz(9)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ + {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ builtin FL-23+SFPC455E */ + {RIG_MODE_FM, kHz(9)}, /* narrow w/ builtin FL-94 */ RIG_FLT_END, }, .str_cal = IC703_STR_CAL, diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c index 07701ae0..f9a6f25d 100644 --- a/rigs/icom/ic706.c +++ b/rigs/icom/ic706.c @@ -238,11 +238,11 @@ const struct rig_caps ic706_caps = /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* bultin FL-272 */ - {RIG_MODE_AM, kHz(8)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ - {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ bultin FL-23+SFPC455E */ - {RIG_MODE_FM, kHz(8)}, /* narrow w/ bultin FL-94 */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* builtin FL-272 */ + {RIG_MODE_AM, kHz(8)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ + {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ builtin FL-23+SFPC455E */ + {RIG_MODE_FM, kHz(8)}, /* narrow w/ builtin FL-94 */ {RIG_MODE_WFM, kHz(230)}, /* WideFM, filter FL?? */ RIG_FLT_END, }, @@ -379,11 +379,11 @@ const struct rig_caps ic706mkii_caps = /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* bultin FL-272 */ - {RIG_MODE_AM, kHz(8)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ - {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ bultin FL-23+SFPC455E */ - {RIG_MODE_FM, kHz(8)}, /* narrow w/ bultin FL-94 */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* builtin FL-272 */ + {RIG_MODE_AM, kHz(8)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ + {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ builtin FL-23+SFPC455E */ + {RIG_MODE_FM, kHz(8)}, /* narrow w/ builtin FL-94 */ {RIG_MODE_WFM, kHz(230)}, /* WideFM, filter FL?? */ RIG_FLT_END, }, @@ -565,11 +565,11 @@ const struct rig_caps ic706mkiig_caps = }, /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* bultin FL-272 */ - {RIG_MODE_AM, kHz(8)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ - {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ bultin FL-23+SFPC455E */ - {RIG_MODE_FM, kHz(8)}, /* narrow w/ bultin FL-94 */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* builtin FL-272 */ + {RIG_MODE_AM, kHz(8)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ + {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ builtin FL-23+SFPC455E */ + {RIG_MODE_FM, kHz(8)}, /* narrow w/ builtin FL-94 */ {RIG_MODE_WFM, kHz(230)}, /* WideFM, filter FL?? */ RIG_FLT_END, }, diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index 79f590bd..d0d8f816 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -1,5 +1,5 @@ /* - * Hamlib CI-V backend - description of IC-9100 (HF/VHF/UHF All-Mode Tranceiver) + * Hamlib CI-V backend - description of IC-9100 (HF/VHF/UHF All-Mode Transceiver) * Copyright (c) 2000-2011 by Stephane Fillod * * diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c index 620daa4a..5583694e 100644 --- a/rigs/icom/ic718.c +++ b/rigs/icom/ic718.c @@ -160,13 +160,13 @@ const struct rig_caps ic718_caps = }, /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.1)}, /* bultin */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.1)}, /* builtin */ {RIG_MODE_CW | RIG_MODE_RTTY, Hz(500)}, /* FL-52A */ {RIG_MODE_CW | RIG_MODE_RTTY, Hz(250)}, /* FL-53A */ {RIG_MODE_SSB, kHz(2.8)}, /* FL-96 */ {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, kHz(1.8)}, /* FL-222 */ - {RIG_MODE_AM, kHz(6)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ + {RIG_MODE_AM, kHz(6)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ RIG_FLT_END, }, diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c index 63b8b1fe..1037e898 100644 --- a/rigs/icom/ic746.c +++ b/rigs/icom/ic746.c @@ -513,7 +513,7 @@ const struct rig_caps ic746pro_caps = {RIG_MODE_FM, kHz(15)}, {RIG_MODE_FM, kHz(7)}, - /* There are 5 rtty filters when rtty filter mode is set (default condition) { 1k, 500, 350, 300, 250 }. These are fixed. If rtty filter mode is unset there are 3 general IF filters { 2.4k, 500, 250 are the defaults }. These can be changed. There is a "twin-peak" filter mode as well. It boosts the 2125 and 2295 recieve frequency reponse. The S_FUNC_RF (rtty filter) turns the rtty filter mode on and off. */ + /* There are 5 rtty filters when rtty filter mode is set (default condition) { 1k, 500, 350, 300, 250 }. These are fixed. If rtty filter mode is unset there are 3 general IF filters { 2.4k, 500, 250 are the defaults }. These can be changed. There is a "twin-peak" filter mode as well. It boosts the 2125 and 2295 receive frequency response. The S_FUNC_RF (rtty filter) turns the rtty filter mode on and off. */ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(500)}, /* RTTY & "normal" IF Filters */ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(250)}, /* RTTY & "narrow" IF Filters */ diff --git a/rigs/icom/ic775.c b/rigs/icom/ic775.c index fd78ddda..99aa1d73 100644 --- a/rigs/icom/ic775.c +++ b/rigs/icom/ic775.c @@ -155,11 +155,11 @@ const struct rig_caps ic775_caps = }, /* mode/filter list, remember: order matters! */ .filters = { - {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* bultin FL-272 */ - {RIG_MODE_AM, kHz(8)}, /* mid w/ bultin FL-94 */ - {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ bultin FL-272 */ - {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ bultin FL-23+SFPC455E */ - {RIG_MODE_FM, kHz(8)}, /* narrow w/ bultin FL-94 */ + {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_RTTY, kHz(2.4)}, /* builtin FL-272 */ + {RIG_MODE_AM, kHz(8)}, /* mid w/ builtin FL-94 */ + {RIG_MODE_AM, kHz(2.4)}, /* narrow w/ builtin FL-272 */ + {RIG_MODE_FM, kHz(15)}, /* ?? TBC, mid w/ builtin FL-23+SFPC455E */ + {RIG_MODE_FM, kHz(8)}, /* narrow w/ builtin FL-94 */ RIG_FLT_END, }, diff --git a/rigs/icom/ic820h.c b/rigs/icom/ic820h.c index 0609077b..f3175220 100644 --- a/rigs/icom/ic820h.c +++ b/rigs/icom/ic820h.c @@ -1,5 +1,5 @@ /* - * Hamlib CI-V backend - description of IC-820H (VHF/UHF All-Mode Tranceiver) + * Hamlib CI-V backend - description of IC-820H (VHF/UHF All-Mode Transceiver) * Contributed by Francois Retief <fgr...@su...> * Copyright (c) 2000-2010 by Stephane Fillod * diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c index 442ca217..39b0597b 100644 --- a/rigs/icom/ic821h.c +++ b/rigs/icom/ic821h.c @@ -1,5 +1,5 @@ /* - * Hamlib CI-V backend - description of IC-821H (VHF/UHF All-Mode Tranceiver) + * Hamlib CI-V backend - description of IC-821H (VHF/UHF All-Mode Transceiver) * Contributed by Francois Retief <fgr...@su...> * Copyright (c) 2000-2010 by Stephane Fillod * diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c index 165c2749..4ac8da14 100644 --- a/rigs/icom/ic9100.c +++ b/rigs/icom/ic9100.c @@ -1,5 +1,5 @@ /* - * Hamlib CI-V backend - description of IC-9100 (HF/VHF/UHF All-Mode Tranceiver) + * Hamlib CI-V backend - description of IC-9100 (HF/VHF/UHF All-Mode Transceiver) * Copyright (c) 2000-2011 by Stephane Fillod * * diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index f79773c6..66a1eb6c 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -1578,7 +1578,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode, switch (mode) { case RIG_MODE_PKTUSB: - // xFE xFE x6E xE0 x1A x06 x01 xFD switchs mod input from MIC to ACC + // xFE xFE x6E xE0 x1A x06 x01 xFD switches mod input from MIC to ACC // This apparently works for IC-756ProIII but nobody has asked for it yet icom_mode = RIG_MODE_USB; break; @@ -4716,7 +4716,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo) vfo = rig->state.current_vfo; } - // This should automaticaly switch between satmode on/off based on the requested split vfo + // This should automatically switch between satmode on/off based on the requested split vfo if (rig->caps->has_get_func & RIG_FUNC_SATMODE) { if ((tx_vfo == RIG_VFO_SUB || tx_vfo == RIG_VFO_MAIN) @@ -6406,7 +6406,7 @@ int icom_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) /* * icom_get_ant * Assumes rig!=NULL, rig->state.priv!=NULL - * only meaningfull for HF + * only meaningful for HF */ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option, ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx) @@ -7272,7 +7272,7 @@ DECLARE_PROBERIG_BACKEND(icom) /* * try all possible addresses on the CI-V bus - * FIXME: actualy, old rigs do not support C_RD_TRXID cmd! + * FIXME: actually, old rigs do not support C_RD_TRXID cmd! * Try to be smart, and deduce model depending * on freq range, return address, and * available commands. diff --git a/rigs/icom/icom_defs.h b/rigs/icom/icom_defs.h index 840419e3..529f6fd0 100644 --- a/rigs/icom/icom_defs.h +++ b/rigs/icom/icom_defs.h @@ -526,7 +526,7 @@ /* * Tokens for Extra Level and Parameters common to multiple rigs. Use token # > 99. Defined here so they * will be available in ICOM name space. They have different internal commands primarily in dsp rigs. These - * tokens are used ext_lvl and ext_parm funtions in the individual rig files. + * tokens are used ext_lvl and ext_parm functions in the individual rig files. * Extra parameters which are rig specific should be coded in the individual rig files and token #s < 100. */ diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c index 1f0f777f..dbc5ca8c 100644 --- a/rigs/icom/icr7000.c +++ b/rigs/icom/icr7000.c @@ -309,7 +309,7 @@ static int r7000_set_freq(RIG *rig, vfo_t vfo, freq_t freq) long long f = (long long)freq; /* - * The R7000 cannot set freqencies higher than 1GHz, + * The R7000 cannot set frequencies higher than 1GHz, * this is done by flipping a switch on the front panel and * stripping the most significant digit. * This is the only change with the common icom_set_freq diff --git a/rigs/jrc/jrc.c b/rigs/jrc/jrc.c index 3f665ccf..c4bf4e11 100644 --- a/rigs/jrc/jrc.c +++ b/rigs/jrc/jrc.c @@ -1358,7 +1358,7 @@ int jrc_set_mem(RIG *rig, vfo_t vfo, int ch) cmd_len = sprintf(cmdbuf, "C%03d" EOM, ch); - /* don't care about the Automatic reponse from receiver */ + /* don't care about the Automatic response from receiver */ return jrc_transaction(rig, cmdbuf, cmd_len, membuf, &mem_len); } diff --git a/rigs/kenwood/README.ts2k b/rigs/kenwood/README.ts2k index 6dc39240..cbc92a6d 100644 --- a/rigs/kenwood/README.ts2k +++ b/rigs/kenwood/README.ts2k @@ -36,7 +36,7 @@ File change summary: (Hopefully, I'll keep this updated...) (Currently every menu item number and text is entered but the menu default is not set. For example, grig can't be expected to know every rig's menu's. in work!) - It just occured to me that it would be very nice to + It just occurred to me that it would be very nice to have a default hamlib menu. If a rig don't have any or no menu functions yet, the levels and other items can be presented as a default menu. diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c index 5039ebcf..3f276355 100644 --- a/rigs/kenwood/ic10.c +++ b/rigs/kenwood/ic10.c @@ -121,7 +121,7 @@ transaction: if (strncmp("ID", buffer, 2)) { - rig_debug(RIG_DEBUG_ERR, "%s: expected ID reponse and got %s\n", __func__, + rig_debug(RIG_DEBUG_ERR, "%s: expected ID response and got %s\n", __func__, buffer); return retval; } @@ -147,7 +147,7 @@ transaction: } /* - * Get the anwser of IF command, with retry handling + * Get the answer of IF command, with retry handling */ static int get_ic10_if(RIG *rig, char *data) { diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index a2c6fc86..b4636c88 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -221,7 +221,7 @@ const struct confparams kenwood_cfg_params[] = * * returns: * RIG_OK - if no error occurred. - * RIG_EIO - if an I/O error occured while sending/receiving data. + * RIG_EIO - if an I/O error occurred while sending/receiving data. * RIG_ETIMEOUT - if timeout expires without any characters received. * RIG_REJECTED - if a negative acknowledge was received or command not * recognized by rig. @@ -566,7 +566,7 @@ transaction_quit: * expected Value of expected string length * * Returns: - * RIG_OK - if no error occured. + * RIG_OK - if no error occurred. * RIG_EPROTO if returned string and expected are not equal * Error from kenwood_transaction() if any * diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 16fb01c7..879e2cd4 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -116,7 +116,7 @@ struct kenwood_priv_data int k2_md_rtty; /* K2 RTTY mode available flag, 1 = RTTY, 0 = N/A */ char *fw_rev; /* firmware revision level */ int trn_state; /* AI state discovered at startup */ - unsigned fw_rev_uint; /* firmware revison as a number 1.07 -> 107 */ + unsigned fw_rev_uint; /* firmware revision as a number 1.07 -> 107 */ char verify_cmd[4]; /* command used to verify set commands */ int is_emulation; /* flag for TS-2000 emulations */ void *data; /* model specific data */ diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index a7a3cebe..5c1b3838 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -388,7 +388,7 @@ int pihspdr_get_channel(RIG *rig, channel_t *chan, int read_only) /* Memory group no */ chan->scan_group = buf[ 40 ] - '0'; - /* Fileds 38-39 contain tuning step as a number 00 - 09. + /* Fields 38-39 contain tuning step as a number 00 - 09. Tuning step depends on this number and the mode, just save it for now */ buf[ 40 ] = '\0'; @@ -633,7 +633,7 @@ int pihspdr_set_channel(RIG *rig, const channel_t *chan) } else { - tone = -1; /* -1 because we will add 1 when outputing; this is necessary as CTCSS codes are numbered from 1 */ + tone = -1; /* -1 because we will add 1 when outputting; this is necessary as CTCSS codes are numbered from 1 */ } /* find CTCSS code */ diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c index 942018df..1a352e59 100644 --- a/rigs/kenwood/th.c +++ b/rigs/kenwood/th.c @@ -1418,7 +1418,7 @@ th_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) return -RIG_EINVAL; } - i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ + i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomaly */ snprintf(tonebuf, sizeof tonebuf, "TN %02d", i); return kenwood_transaction(rig, tonebuf, tonebuf, sizeof tonebuf); } @@ -1496,7 +1496,7 @@ th_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) return -RIG_EINVAL; } - i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ + i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomaly */ snprintf(tonebuf, sizeof tonebuf, "CTN %02d", i); return kenwood_transaction(rig, tonebuf, tonebuf, sizeof tonebuf); } diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c index 61649672..2605b721 100644 --- a/rigs/kenwood/thd74.c +++ b/rigs/kenwood/thd74.c @@ -1108,7 +1108,7 @@ static int thd74_set_parm(RIG *rig, setting_t parm, value_t val) switch (parm) { - case RIG_PARM_TIME: // FIXME check val, send formated via RT + case RIG_PARM_TIME: // FIXME check val, send formatted via RT default: return -RIG_EINVAL; } diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 1be085de..2cef024c 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -415,7 +415,7 @@ int ts2000_get_channel(RIG *rig, channel_t *chan, int read_only) /* Memory group no */ chan->scan_group = buf[ 40 ] - '0'; - /* Fileds 38-39 contain tuning step as a number 00 - 09. + /* Fields 38-39 contain tuning step as a number 00 - 09. Tuning step depends on this number and the mode, just save it for now */ buf[ 40 ] = '\0'; @@ -665,7 +665,7 @@ int ts2000_set_channel(RIG *rig, const channel_t *chan) } else { - tone = -1; /* -1 because we will add 1 when outputing; this is necessary as CTCSS codes are numbered from 1 */ + tone = -1; /* -1 because we will add 1 when outputting; this is necessary as CTCSS codes are numbered from 1 */ } /* find CTCSS code */ diff --git a/rigs/kenwood/ts2000.txt b/rigs/kenwood/ts2000.txt index e98b737f..132e6027 100644 --- a/rigs/kenwood/ts2000.txt +++ b/rigs/kenwood/ts2000.txt @@ -3,7 +3,7 @@ Version: June 6, 2002 This document provides some data on translating commands from the TS-2000 to/from hamlib. It shows the sequence that should be used - to acheive a particular function result. Sometimes a particular + to achieve a particular function result. Sometimes a particular sequence should be called. --D. Edmons, kd7eni @@ -52,7 +52,7 @@ rig_init() "id;" ts2000_init() "?;" If this occurs, one of the above may be the cause. Also, the user may have a menu currently selected using the rig front panel. I currently don't know any way to get - this info from the rig. I highly reccomend that a + this info from the rig. I highly recommend that a message be sent to the user if "?;" occurs on more than one retry, that he/she must deselect this manually. There is no other way. (I've enabled "ai2;" and no @@ -67,13 +67,13 @@ rig_cleanup() none rig_get_freq() Independent of PTT/CTRL rig_set_freq() "fa...;... [truncated message content] |