Merge branch 'master' of github.com:Hamlib/Hamlib

NEWS

@@ -13,7 +13,7 @@ Version 5.x -- future
         * Change FT1000MP Mark V model names to align with FT1000MP
 
 Version 4.6
-	* send_raw can now take hex digits as colon-seperated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd
+	* send_raw can now take hex digits as colon-separated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd
 	* Add IC7760
         * IC7300 Mode filter can now be set by # (i.e. 1,2,3) 
         * Fixed AF6SA WRC rotor controller
@@ -44,7 +44,7 @@ Version 4.6
         * Added Thetis entry -- derived from FlexRadio/Apache PowerSDR
         * Added VOICE/CW memory capability to many rigs -- thanks to David Balharrie M0DGB/G8FKH
         * Add -# --skip_init option to rigctl to skip rig initialization -- useful for executing commands quickly
-        * rig_caps is no longer constant -- this may break some 3rd party relying on the "const" declaration.  Here's an example of how to handle compatiblity.
+        * rig_caps is no longer constant -- this may break some 3rd party relying on the "const" declaration.  Here's an example of how to handle compatibility.
 #ifdef RIGCAPS_NOT_CONST
 static int add_to_list(struct rig_caps* rc, void*)
 #else
@@ -66,7 +66,7 @@ static int add_to_list(const struct rig_caps* rc, void*)
         * Added rig_cm108_get/set_bit to API and get/set_gpio to rigctl(d) for GPIO1,2,3,4 access on CM108
         * Added BG2FX FX4/C/CR/L
         * Fixed IC7610 to use new 0x25 0x26 command added in latest firmware
-        * Fix W command in rigctld to work propery -- can take terminating char or # of bytes to expect
+        * Fix W command in rigctld to work properly -- can take terminating char or # of bytes to expect
         * Add rig_set_debug_filename so Python can redirect debug stream
         * Fix Yaesu LBL_NR to use proper values
         * Add IC-905

bindings/csharp/multicast/README.txt

@@ -22,7 +22,7 @@ You should then be able to run
 ./bin/Debug/net6.0/multicast
 
 ======================================================
-Waiting for Net 7.0/8.0 to be in Ubunut main packages
+Waiting for Net 7.0/8.0 to be in Ubuntu main packages
 Following did not work
 
 sudo apt remove 'dotnet*' 'aspnet*' 'netstandard*'

rigs/icom/ic821h.c

@@ -181,8 +181,8 @@ struct rig_caps ic821h_caps =
     },
     /* mode/filter list, remember: order matters! */
     .filters =  {
-        {RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* buildin */
+        {RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* built-in */
-        {RIG_MODE_FM, kHz(15)},                 /* buildin */
+        {RIG_MODE_FM, kHz(15)},                 /* built-in */
         RIG_FLT_END,
     },
 

rigs/kenwood/thf6a.c

@@ -5,7 +5,7 @@
  *
  *  10-03-2010
  *    Ported from Stephane Fillod's thf7.c
- *    Changed TH-F7E perameters to reflect TH-F6A
+ *    Changed TH-F7E parameters to reflect TH-F6A
  *    Changed RIG_ITU_REGION from 1 to 2
  *
  *

rigs/kenwood/ts590.c

@@ -400,7 +400,7 @@ static int ts590_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         const int ssb_htable[] = { 1000, 1200, 1400, 1600, 1800, 2000, 2200, 2400, 2600, 2800, 3000, 3400, 4000, 5000 };
         const int ssb_ltable[] = { 0, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 };
         *width = ssb_htable[hwidth];
-        // we dont' do anything with shift yet which will be just the hwidth value
+        // we don't do anything with shift yet which will be just the hwidth value
         shift = ssb_ltable[lwidth];
     }
     else if (*mode == RIG_MODE_AM || *mode == RIG_MODE_PKTAM)

rigs/yaesu/README.ft920

@@ -97,7 +97,7 @@ rig_get_split_mode
         and set "proper" VFO?
 
 rig_set_rit
-    *   Hamlib specificies that passing 0 as the RIT frequency disables
+    *   Hamlib specifies that passing 0 as the RIT frequency disables
         RIT.  Thus there is no way to meet the spec and mimic the front
         panel RIT off function whilst keeping the RIT offset on the
         display.  The Hamlib spec causes behavior analogous to shutting
@@ -112,7 +112,7 @@ rig_get_rit
     *   vfo is honored and stored RIT is returned.
 
 rig_set_xit
-    *   Hamlib specificies that passing 0 as the XIT frequency disables
+    *   Hamlib specifies that passing 0 as the XIT frequency disables
         XIT.  Thus there is no way to meet the spec and mimic the front
         panel XIT off function whilst keeping the XIT offset on the
         display.  The Hamlib spec causes behavior analogous to shutting

rotators/easycomm/easycomm.txt

@@ -34,7 +34,7 @@ may only decode the rotator control commands.
 
 The Host PC can issue the following commands -:
 
-Command		Meaning			Perameters
+Command		Meaning			Parameters
 -------		-------			----------
 
 AZ		Azimuth             number - 1 decimal place [deg]
@@ -88,7 +88,7 @@ EASYCOMM III Standard
 The EasyComm 3 standard is an extension of the version 2 with the additional features:
 
 
-Command		Meaning			Perameters	Hamlib Config Token
+Command		Meaning			Parameters	Hamlib Config Token
 -------		-------			----------	-------------------
 VL		Velocity Left	    number [mdeg/s]
 VR		Velocity Right	    number [mdeg/s]

simulators/simts890.c

@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
 
         if (strcmp(buf, "IF;") == 0)
         {
-            // Reads the tranceiver status
+            // Reads the transceiver status
 #if defined(LEGACY)
             char ifbuf[256];
             hl_usleep(mysleep * 1000);
@@ -1322,7 +1322,7 @@ int main(int argc, char *argv[])
             case '3': // Bandscope Span
             case '4': // Bandscope Span
             case '5': // Bandscope Scope Range (Fixed Mode)
-            case '6': // Bandscope Dispaly Pause
+            case '6': // Bandscope Display Pause
             case '7': // Bandscope Marker
             case '8': // Bandscope Attenuator
             case '9': // Bandscope Max Hold
@@ -1371,7 +1371,7 @@ int main(int argc, char *argv[])
             case '0': // Registration of CW Message (Paddle Input)
             case '1': // Play/Stop the CW Message
             case '2': // Register State of CW Message (Paddle Input)
-            case '3': // Clear the CW Message (Paddle Inut)
+            case '3': // Clear the CW Message (Paddle Input)
             case '4': // CW Message Memory Name (Paddle Input)
             case '5': // Registering the CW Message Memory (Text Input)
             case '6': // CW Message Channel Repeat
@@ -1454,7 +1454,7 @@ int main(int argc, char *argv[])
             case '2': // Memory Channel (Channel Name)
             case '3': // Memory Channel (Scan Lockout)
             case '4': // Memory Channel (Channel Copy)
-            case '5': // Memory Channle (Channel Deletion)
+            case '5': // Memory Channel (Channel Deletion)
             case '6': // Programmable VFO End Frequency
             case '7': // Memory Channel (Temporary Change Frequency)
                 break;

src/microham.c

@@ -721,7 +721,7 @@ static void writeControl(const unsigned char *data, int len)
 //
 // send a heartbeat and record time
 // The "last heartbeat" time is recorded in a global variable
-// such that the service thread can decice whether a new
+// such that the service thread can decide whether a new
 // heartbeat is due.
 //
 static void heartbeat()

src/rig.c

@@ -7547,7 +7547,7 @@ int HAMLIB_API rig_stop_morse(RIG *rig, vfo_t vfo)
 /*
  * wait_morse_ptt
  * generic routine to wait for ptt=0
- * should work on any full breakin CW morse send
+ * should work on any full break-in CW morse send
  * Assumes rig!=NULL, msg!=NULL
  */
 static int wait_morse_ptt(RIG *rig, vfo_t vfo)

src/sleep.c

@@ -116,7 +116,7 @@ int hl_usleep(rig_useconds_t usec)
     int retval = 0;
     rig_debug(RIG_DEBUG_ERR, "%s: usec=%ld\n", __func__, usec);
 
-    if (usec <= 1000) { return 0; } // dont' sleep if only 1ms is requested -- speeds things up on Windows
+    if (usec <= 1000) { return 0; } // don't sleep if only 1ms is requested -- speeds things up on Windows
 
     while (usec > 1000000)
     {