[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 1e310b7958bcb0c324683
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 1e310b7958bcb0c3246837e3cf8e2a497bcc6e48
|
From: n0nb <n0...@us...> - 2025-08-04 13:41:27
|
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 1e310b7958bcb0c3246837e3cf8e2a497bcc6e48 (commit)
via c881bc713231d3505a5021338d1406edfedd470f (commit)
via fbe9803777f7b41fca075d8a371a33e5b3ad9607 (commit)
via 8d8d0328bfb9fe7fae5c2d273f4adc04e44ae1ca (commit)
from 8ccc197b7c01efdb0b22774d0b2210b6bec28e92 (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 1e310b7958bcb0c3246837e3cf8e2a497bcc6e48
Merge: c881bc713 fbe980377
Author: Nate Bargmann <n0...@n0...>
Date: Mon Aug 4 08:04:15 2025 -0500
Merge GitHub PR #1828
commit c881bc713231d3505a5021338d1406edfedd470f
Merge: 8ccc197b7 8d8d0328b
Author: Nate Bargmann <n0...@n0...>
Date: Mon Aug 4 07:49:28 2025 -0500
Merge GitHub PR #1827
commit fbe9803777f7b41fca075d8a371a33e5b3ad9607
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sun Aug 3 13:18:09 2025 +0200
Fix initialization of comm_status
The function rig_init() doesn't touch the hardware, it's rig_open()
that initiates the connection and in fact the first use of comm_status
in rig_open() is when it gets the value RIG_COMM_STATUS_CONNECTING and
rig_close() sets it to RIG_COMM_STATUS_DISCONNECTED.
diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 65ddc82a3..111311978 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -47,10 +47,12 @@ class TestClass:
assert rig is not None
assert rig.state.comm_state == 0
+ assert rig.state.comm_status == Hamlib.RIG_COMM_STATUS_DISCONNECTED
assert rig.set_conf("rig_pathname", rig_file) is None
assert rig.set_conf("serial_speed", str(serial_speed)) is None
assert rig.open() is None
assert rig.state.comm_state == 1
+ assert rig.state.comm_status == Hamlib.RIG_COMM_STATUS_OK
info = rig.get_info()
assert isinstance(info, str)
@@ -116,6 +118,7 @@ class TestClass:
assert rig.close() is None
assert rig.state.comm_state == 0
+ assert rig.state.comm_status == Hamlib.RIG_COMM_STATUS_DISCONNECTED
info = rig.get_info()
assert info is None
diff --git a/src/rig.c b/src/rig.c
index 63019fdf8..706ca4d91 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -669,7 +669,7 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
rs->async_data_enabled = 0;
// rs->depth = 1;
rs->comm_state = 0;
- rs->comm_status = RIG_COMM_STATUS_CONNECTING;
+ rs->comm_status = RIG_COMM_STATUS_DISCONNECTED;
rs->tuner_control_pathname = DEFAULT_TUNER_CONTROL_PATHNAME;
strncpy(rs->client_version, "Hamlib", sizeof(rs->client_version));
commit 8d8d0328bfb9fe7fae5c2d273f4adc04e44ae1ca
Author: Daniele Forsi IU5HKX <iu...@gm...>
Date: Sat Aug 2 16:10:20 2025 +0200
Fix typos
diff --git a/amplifiers/elecraft/kpa.c b/amplifiers/elecraft/kpa.c
index 431eb7735..f0b0eab55 100644
--- a/amplifiers/elecraft/kpa.c
+++ b/amplifiers/elecraft/kpa.c
@@ -365,7 +365,7 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
return -RIG_EPROTO;
}
- rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dKHz,%dKHz\n", __func__,
+ rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dkHz,%dkHz\n", __func__,
int_value, int_value2);
//
diff --git a/amplifiers/expert/expert.c b/amplifiers/expert/expert.c
index 73f706eaa..6d0a6c94e 100644
--- a/amplifiers/expert/expert.c
+++ b/amplifiers/expert/expert.c
@@ -398,7 +398,7 @@ int expert_get_level(AMP *amp, setting_t level, value_t *val)
return -RIG_EPROTO;
}
- rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dKHz,%dKHz\n", __func__,
+ rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dkHz,%dkHz\n", __func__,
int_value, int_value2);
//
diff --git a/extra/kylix/hamlib_rigapi.pas b/extra/kylix/hamlib_rigapi.pas
index b9cec3ee3..a2eba70e8 100644
--- a/extra/kylix/hamlib_rigapi.pas
+++ b/extra/kylix/hamlib_rigapi.pas
@@ -56,7 +56,7 @@ const
HAMLIB_RIGVERSIZ = 8;
HAMLIB_FILPATHLEN = 512;
HAMLIB_FRQRANGESIZ = 30;
- HAMLIB_MAXCHANDESC = 30; {* describe channel eg: "WWV 5Mhz" *}
+ HAMLIB_MAXCHANDESC = 30; {* describe channel eg: "WWV 5 MHz" *}
HAMLIB_TSLSTSIZ = 20; {* max tuning step list size, zero ended *}
HAMLIB_FLTLSTSIZ = 16; {* max mode/filter list size, zero ended *}
HAMLIB_MAXDBLSTSIZ = 8; {* max preamp/att levels supported, zero ended *}
diff --git a/include/hamlib/amplist.h b/include/hamlib/amplist.h
index a123f8841..363cba450 100644
--- a/include/hamlib/amplist.h
+++ b/include/hamlib/amplist.h
@@ -126,7 +126,7 @@
/**
* \brief A macro that returns the model number of `DX1200`.
*
- * The Gemini DX1200 covers 160 trhough 4 meters.
+ * The Gemini DX1200 covers 160 through 4 meters.
*/
#define AMP_MODEL_GEMINI_DX1200 AMP_MAKE_MODEL(AMP_GEMINI, 1)
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 7c79443a7..f2bf347d1 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -303,7 +303,7 @@ typedef struct s_rig RIG;
#define HAMLIB_RIGVERSIZ 8
#define HAMLIB_FILPATHLEN 512
#define HAMLIB_FRQRANGESIZ 30
-#define HAMLIB_MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
+#define HAMLIB_MAXCHANDESC 30 /* describe channel eg: "WWV 5 MHz" */
#define HAMLIB_TSLSTSIZ 20 /* max tuning step list size, zero ended */
#define HAMLIB_FLTLSTSIZ 60 /* max mode/filter list size, zero ended */
#define HAMLIB_MAXDBLSTSIZ 8 /* max preamp/att levels supported, zero ended */
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 9c70437d9..1ea435dbe 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -152,7 +152,7 @@ static int format_freq(char *buf, int buf_len, freq_t freq)
/*
* actually, frequency must be like nnnnnnnnm0,
- * where m must be 0 or 5 (for 50Hz).
+ * where m must be 0 or 5 (for 50 Hz).
*/
lowhz = f % 100;
f /= 100;
@@ -595,7 +595,7 @@ int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
/*
* actually, tuning step must be like nnnnm0,
- * where m must be 0 or 5 (for 50Hz).
+ * where m must be 0 or 5 (for 50 Hz).
*/
SNPRINTF(tsbuf, sizeof(tsbuf), "ST%06ld" EOM, ts);
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index cd067642b..1a6fe26f5 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -232,7 +232,7 @@ int ar3k_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/*
* actually, frequency must be like nnnn.nnnnm,
- * where m must be 0 or 5 (for 50Hz).
+ * where m must be 0 or 5 (for 50 Hz).
*/
lowhz = ((unsigned)freq) % 100;
freq /= 100;
@@ -400,7 +400,7 @@ int ar3k_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
/*
* actually, frequency must be like nnn.nm,
- * where m must be 0 or 5 (for 50Hz).
+ * where m must be 0 or 5 (for 50 Hz).
*/
lowhz = ts % 100;
ts /= 100;
diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c
index ccee0e476..cc4fd6839 100644
--- a/rigs/aor/ar5000.c
+++ b/rigs/aor/ar5000.c
@@ -41,7 +41,7 @@
#define AR5000_VFO (RIG_VFO_A | RIG_VFO_B | RIG_VFO_C | RIG_VFO_N(3) | RIG_VFO_N(4))
/* As reported with rigctl 'l RAWSTR' for AR5000A S/n: 171218
- on 7040kHz / CW / 3kHz Bw.
+ on 7040 kHz / CW / 3 kHz Bw.
The data available on http://www.aoruk.com did not match very well on HF */
#define AR5000_STR_CAL { 16, { \
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index e5a4fafed..1536158fe 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -540,7 +540,7 @@ static int ar7030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_CWPITCH :
// bfoval Mem_Page=0 Address=36
- // BFO offset in Hz (x33.19Hz)(values -4248.320 to 4215.130kHz).
+ // BFO offset in Hz (x33.19 Hz)(values -4248.320 to 4215.130 kHz).
val.i = val.i * 100 / 3319;
if (val.i < -128) {val.i = -128;}
@@ -619,7 +619,7 @@ static int ar7030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_CWPITCH :
// bfoval Mem_Page=0 Address=36
- // BFO offset in Hz (x33.19Hz)(values -4248.320 to 4215.130kHz).
+ // BFO offset in Hz (x33.19 Hz)(values -4248.320 to 4215.130 kHz).
setMemPtr(rig, 0, 0x36);
val->i = ((char)rxr_readByte(rig) * 3319) / 100;
return RIG_OK;
diff --git a/rigs/aor/ar7030p.h b/rigs/aor/ar7030p.h
index 33e38d167..0e604f053 100644
--- a/rigs/aor/ar7030p.h
+++ b/rigs/aor/ar7030p.h
@@ -685,7 +685,7 @@ processor. - Keep out (by order).
byte 2 bit 4 rx_aux Aux relay enable
byte 2 bit 5 rx_fs5 Filter select : FS5
byte 2 bit 6 rx_fs6 Filter select : FS6
- byte 2 bit 7 rx_ibw IF b/w : 0 = 4kHz / 1 = 10kHz
+ byte 2 bit 7 rx_ibw IF b/w : 0 = 4 kHz / 1 = 10 kHz
byte 3 bit 0 rx_chg Fast charge enable
byte 3 bit 1 rx_pwr PSU enable
byte 3 bit 2 rx_svi Sync VCO inhibit
diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c
index e1e483022..fa8334747 100644
--- a/rigs/aor/ar8000.c
+++ b/rigs/aor/ar8000.c
@@ -145,7 +145,7 @@ struct rig_caps ar8000_caps =
/* mode/filter list, .remember = order matters! */
{RIG_MODE_SSB | RIG_MODE_CW, kHz(2)},
{RIG_MODE_FM | RIG_MODE_AM, kHz(12)},
- {RIG_MODE_WFM, kHz(180)}, /* 50kHz at -3dB, 380kHz at -20dB */
+ {RIG_MODE_WFM, kHz(180)}, /* 50 kHz at -3dB, 380 kHz at -20dB */
RIG_FLT_END,
},
diff --git a/rigs/aor/ar8200.c b/rigs/aor/ar8200.c
index 18e4cda19..5c7c65c32 100644
--- a/rigs/aor/ar8200.c
+++ b/rigs/aor/ar8200.c
@@ -170,7 +170,7 @@ struct rig_caps ar8200_caps =
{RIG_MODE_AM, kHz(3)},
{RIG_MODE_FM | RIG_MODE_AM, kHz(12)},
{RIG_MODE_FM, kHz(9)},
- {RIG_MODE_WFM, kHz(230)}, /* 50kHz at -3dB, 380kHz at -20dB */
+ {RIG_MODE_WFM, kHz(230)}, /* 50 kHz at -3dB, 380 kHz at -20dB */
RIG_FLT_END,
},
diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c
index 1c05bbc05..dd68fd605 100644
--- a/rigs/aor/ar8600.c
+++ b/rigs/aor/ar8600.c
@@ -171,7 +171,7 @@ struct rig_caps ar8600_caps =
{RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_AM, kHz(3)},
{RIG_MODE_FM | RIG_MODE_AM, kHz(12)},
{RIG_MODE_FM, kHz(9)},
- {RIG_MODE_WFM, kHz(230)}, /* 150kHz at -3dB, 380kHz at -20dB */
+ {RIG_MODE_WFM, kHz(230)}, /* 150 kHz at -3dB, 380 kHz at -20dB */
RIG_FLT_END,
},
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 73525fe78..121b8713f 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -164,7 +164,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
for (i = 0; i < 10; ++i)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s: Mhz=%lg, lo=%lg, hi=%lg\n", __func__,
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: MHz=%lg, lo=%lg, hi=%lg\n", __func__,
freq_MHz, chan_map[i].lo, chan_map[i].hi);
if (freq_MHz >= chan_map[i].lo && freq_MHz <= chan_map[i].hi)
diff --git a/rigs/commradio/commradio.c b/rigs/commradio/commradio.c
index 560419438..b9a7d9acf 100644
--- a/rigs/commradio/commradio.c
+++ b/rigs/commradio/commradio.c
@@ -178,7 +178,7 @@ int commradio_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
}
}
// CTX-10 returns 11 02 30 00 00 00 01 if we try to go out of its
- // general-coverage frequency range 150kHz - 30MHz. I'm not sure why Hamlib
+ // general-coverage frequency range 150 kHz - 30 MHz. I'm not sure why Hamlib
// even tries to do this, since its defined in the caps...
else
{
diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c
index 0fe7d5f66..028128eeb 100644
--- a/rigs/drake/drake.c
+++ b/rigs/drake/drake.c
@@ -102,7 +102,7 @@ void drake_fix_string(char* inStr)
* sentLen - the length of sentSt
* recdStr - the radio's response string
* recdLen - the length of recdStr
- * res - The transaction reposnse
+ * res - The transaction response
*/
void drake_trans_rept(char* hdrStr, char* sentStr, int sentLen, char* recdStr, int recdLen, int res)
{
@@ -112,7 +112,7 @@ void drake_trans_rept(char* hdrStr, char* sentStr, int sentLen, char* recdStr, i
int i;
//in most cases each string is a buffer, so we need to ensure both command and response
- //are not NULL and null-terminated before duplicastion and conversion.
+ //are not NULL and null-terminated before duplication and conversion.
if ((sentStr != NULL) && (sentLen > 0))
{
@@ -253,7 +253,7 @@ int drake_report_signal(RIG *rig, char* owner)
* Common routine to decode the frequency block
*
* inputs: rig - pointer to RIG structure
- * freqbuf - buffer containung radio's response string
+ * freqbuf - buffer containing radio's response string
* offset - offset to beginning of string due to differences in R8 vs. R8A/B
* Note: strings are virtually identical. offset is provided as a failsafe.
*
@@ -331,7 +331,7 @@ int drake_report_frequency(RIG *rig, char* owner)
* Common routine to break out the 5-character mode string
*
* inputs: rig - pointer to RIG structure
- * mdbuf - buffer containung radio's response string
+ * mdbuf - buffer containing radio's response string
* offset - offset to beginning of string due to differences in R8 vs. R8A/B
*
* Assumes rig!=NULL
@@ -510,7 +510,7 @@ int drake_report_mode(RIG *rig, char* owner)
* Common routine to break out the 3 or 4-character mem string
*
* inputs: rig - pointer to RIG structure
- * mdbuf - buffer containung radio's response string
+ * mdbuf - buffer containing radio's response string
* offset - offset to beginning of string due to differences in R8 vs. R8A/B
* Note: except for channel number size, strings are virtually identical. offset is provided as a failsafe.
*
@@ -716,7 +716,7 @@ int drake_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int ack_len;
int retval;
- // 10Hz resolution - TODO: round nearest?
+ // 10 Hz resolution - TODO: round nearest?
SNPRINTF((char *) freqbuf, sizeof(freqbuf), "F%07u" EOM, (unsigned int)freq / 10);
retval = drake_transaction(rig, freqbuf, strlen(freqbuf), ackbuf, &ack_len);
diff --git a/rigs/dummy/dummy.c b/rigs/dummy/dummy.c
index e25d0bbf3..020fdaeb2 100644
--- a/rigs/dummy/dummy.c
+++ b/rigs/dummy/dummy.c
@@ -463,7 +463,7 @@ static int dummy_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
// if needed for testing enable this to emulate a rig with 100hz resolution
#if 0
- // we emulate a rig with 100Hz set freq interval limits -- truncation
+ // we emulate a rig with 100 Hz set freq interval limits -- truncation
freq = freq - fmod(freq, 100);
#endif
usleep(CMDSLEEP);
diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c
index 87e8f71b6..5938baa2c 100644
--- a/rigs/elad/elad.c
+++ b/rigs/elad/elad.c
@@ -425,7 +425,7 @@ transaction_quit:
*
* Parameters:
* cmd Same as elad_transaction() cmdstr
- * buf Same as kenwwod_transaction() data
+ * buf Same as kenwood_transaction() data
* buf_size Same as elad_transaction() datasize
* expected Value of expected string length
*
diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c
index f052881b3..713463c20 100644
--- a/rigs/icom/ic7000.c
+++ b/rigs/icom/ic7000.c
@@ -156,10 +156,10 @@ static int ic7000_r2i_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width,
return err;
}
- // CAT section of manual says: nn = 0 -40 > bw = 50Hz > 3600Hz
+ // CAT section of manual says: nn = 0 -40 > bw = 50 Hz > 3600 Hz
// Tested by Ian G3VPX 20201029
- // 0 - 9 > bw 50Hz to 500Hz in 50Hz steps
- // 10 - 40 > bw 600Hz to 3600Hz in 100Hz steps
+ // 0 - 9 > bw 50 Hz to 500 Hz in 50 Hz steps
+ // 10 - 40 > bw 600 Hz to 3600 Hz in 100 Hz steps
if (width != RIG_PASSBAND_NOCHANGE)
{
if (width <= 500) { *pd = width / 50 - 1; }
@@ -277,7 +277,7 @@ struct rig_caps ic7000_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), IC7000_ALL_RX_MODES, -1, -1, IC7000_VFOS},
{MHz(400), MHz(470), IC7000_ALL_RX_MODES, -1, -1, IC7000_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, IC7000_OTHER_TX_MODES, W(2), W(100), IC7000_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, IC7000_OTHER_TX_MODES, W(2), W(100), IC7000_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, IC7000_OTHER_TX_MODES, W(2), W(50), IC7000_VFOS, RIG_ANT_2),
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index 9124f35ed..48b7b998f 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -204,7 +204,7 @@ struct rig_caps ic7200_caps =
},
.rx_range_list2 = { {kHz(30), MHz(60), IC7200_ALL_RX_MODES, -1, -1, IC7200_VFOS}, RIG_FRNG_END, },
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, IC7200_OTHER_TX_MODES, W(2), W(100), IC7200_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, IC7200_OTHER_TX_MODES, W(2), W(100), IC7200_VFOS, RIG_ANT_1),
FRQ_RNG_HF(2, IC7200_AM_TX_MODES, W(1), W(40), IC7200_VFOS, RIG_ANT_1), /* AM class */
diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c
index 53adfc32f..610a1b684 100644
--- a/rigs/icom/ic746.c
+++ b/rigs/icom/ic746.c
@@ -348,19 +348,19 @@ struct rig_caps ic746_caps =
#define S_MEM_BEEP 0x506 /* Button confirmation */
#define S_MEM_SQL_CTL 0x508 /* RF/SQL ctl set 0=auto; 1 = sql; 2 = RF+SQL */
#define S_MEM_QSPLT 0x511 /* enable quick split mode */
-/* values -9.999 MHz to + 9.999 Mhz */
+/* values -9.999 MHz to + 9.999 MHz */
#define S_MEM_SPLT_OFST 0x512 /* default split offset 4 bytes little endian last byte sign*/
#define S_MEM_SPLT_LOCK 0x513 /* split lock set */
-/* values 0.000 MHz to + 9.999 Mhz */
+/* values 0.000 MHz to + 9.999 MHz */
#define S_MEM_HF_DUP_OFST 0x514 /* default HF band duplex offset 3 byte little endian */
-#define S_MEM_6M_DUP_OFST 0x515 /* default 50 mHz duplex offset 3 byte little endian */
+#define S_MEM_6M_DUP_OFST 0x515 /* default 50 MHz duplex offset 3 byte little endian */
#define S_MEM_2M_DUP_OFST 0x516 /* default 144 MHz duplex offset 3 byte little endian */
#define S_MEM_AUTO_RPTR 0x518 /* auto repeater set 0=OFF; 1=ON-1; 2=ON-2 */
#define S_MEM_LANG 0x523 /* 0=English 1=Japanese for voice announcer */
#define S_MEM_TRCV 0x536 /* CI-V transceive mode */
#define S_MEM_CMP_LVL 0x538 /* speech compressor level 0-10 */
#define S_MEM_SBASS 0x539 /* SSB TX tone bass level */
-#define S_MEM_RTTY_FL_PB 0x562 /* 0=250 Hz, 1=300' 2 = 350, 3 = 500, 4 = 1 KHz */
+#define S_MEM_RTTY_FL_PB 0x562 /* 0=250 Hz, 1=300' 2 = 350, 3 = 500, 4 = 1 kHz */
#define S_MEM_RTTY_TWNPK 0x563 /* rtty twin peak filter off/on */
#define S_MEM_SCN_SPD 0x570 /* 0 = low; 1 = high */
#define S_MEM_NB_LVL 0x572 /* NB level 0-255 */
diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index bbf870866..5a13c6cb5 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -528,7 +528,7 @@ static const struct confparams ic756pro2_ext_parms[] =
#define S_MEM_TRCV 0x532 /* CI-V transceive mode */
#define S_MEM_LANG 0x536 /* 0=English 1=Japanese for voice announcer */
#define S_MEM_SCN_SPD 0x556 /* 0 = low; 1 = high */
-#define S_MEM_RTTY_FL_PB 0x561 /* 0=250 Hz, 1=300' 2 = 350, 3 = 500, 4 = 1 KHz */
+#define S_MEM_RTTY_FL_PB 0x561 /* 0=250 Hz, 1=300' 2 = 350, 3 = 500, 4 = 1 kHz */
#define S_MEM_RTTY_TWNPK 0x562 /* rtty twin peak filter off/on */
diff --git a/rigs/icom/ic820h.c b/rigs/icom/ic820h.c
index 24bc2bec7..e4674d008 100644
--- a/rigs/icom/ic820h.c
+++ b/rigs/icom/ic820h.c
@@ -84,7 +84,7 @@ struct rig_caps ic820h_caps =
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, }, /* Attenuator 15dB for each band. manual button */
- .max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */
+ .max_rit = Hz(0), /* SSB,CW: +-1.0 kHz FM: +-5.0 kHz */
.max_xit = Hz(0),
.max_ifshift = Hz(0), /* 1.2kHz manual knob */
.targetable_vfo = 0,
diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c
index 62cdfee2e..bed53514c 100644
--- a/rigs/icom/ic821h.c
+++ b/rigs/icom/ic821h.c
@@ -121,7 +121,7 @@ struct rig_caps ic821h_caps =
.dcs_list = NULL,
.preamp = { RIG_DBLST_END, },
.attenuator = { RIG_DBLST_END, }, /* Attenuator 15dB for each band. manual button */
- .max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */
+ .max_rit = Hz(0), /* SSB,CW: +-1.0 kHz FM: +-5.0 kHz */
.max_xit = Hz(0),
.max_ifshift = Hz(0), /* 1.2kHz manual knob */
.targetable_vfo = 0,
diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c
index a1738bdad..5ca4f46b8 100644
--- a/rigs/icom/ic910.c
+++ b/rigs/icom/ic910.c
@@ -236,7 +236,7 @@ struct rig_caps ic910_caps =
.dcs_list = NULL,
.preamp = { 20, RIG_DBLST_END, },
.attenuator = { 20, RIG_DBLST_END, },
- .max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */
+ .max_rit = Hz(0), /* SSB,CW: +-1.0 kHz FM: +-5.0 kHz */
.max_xit = Hz(0),
.max_ifshift = Hz(0), /* 1.2kHz manual knob */
// .targetable_vfo = RIG_TARGETABLE_FREQ,
diff --git a/rigs/icom/ic970.c b/rigs/icom/ic970.c
index 57ed988b4..26a47cd51 100644
--- a/rigs/icom/ic970.c
+++ b/rigs/icom/ic970.c
@@ -99,7 +99,7 @@ struct rig_caps ic970_caps =
.rx_range_list1 = {
{MHz(144), MHz(146), IC970_MODES, -1, -1, IC970_VFO_ALL},
{MHz(430), MHz(440), IC970_MODES, -1, -1, IC970_VFO_ALL},
- /* 1200MHz band module is optional */
+ /* 1200 MHz band module is optional */
// {MHz(1240),MHz(1300),IC970_MODES,-1,-1,IC970_VFO_ALL},
RIG_FRNG_END,
},
@@ -113,7 +113,7 @@ struct rig_caps ic970_caps =
.rx_range_list2 = {
{MHz(144), MHz(150), IC970_MODES, -1, -1, IC970_VFO_ALL},
{MHz(430), MHz(450), IC970_MODES, -1, -1, IC970_VFO_ALL},
- /* 1200MHz band module is optional */
+ /* 1200 MHz band module is optional */
// {MHz(1240),MHz(1300),IC970_MODES,-1,-1,IC970_VFO_ALL},
RIG_FRNG_END,
},
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index e1a00ea67..995a25a0c 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1920,7 +1920,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
*freq = from_bcd(freqbuf + freqbuf_offset, freq_len * 2);
- // 3-byte freq for ID5100 is in 10000Hz units so convert to Hz
+ // 3-byte freq for ID5100 is in 10000 Hz units so convert to Hz
if (freq_len == 3) { *freq *= 10000; }
if (vfo == RIG_VFO_MEM && civ_731_mode_save) { priv->civ_731_mode = 1; }
@@ -5665,7 +5665,7 @@ int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
offs_len = (priv_caps->offs_len) ? priv_caps->offs_len : OFFS_LEN;
/*
- * Icoms are using a 100Hz unit (at least on 706MKIIg) -- SF
+ * Icoms are using a 100 Hz unit (at least on 706MKIIg) -- SF
*/
to_bcd(offsbuf, rptr_offs / 100, offs_len * 2);
@@ -5721,7 +5721,7 @@ int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
}
/*
- * Icoms are using a 100Hz unit (at least on 706MKIIg) -- SF
+ * Icoms are using a 100 Hz unit (at least on 706MKIIg) -- SF
*/
*rptr_offs = from_bcd(offsbuf + 1, buf_len * 2) * 100;
diff --git a/rigs/icom/icom_defs.h b/rigs/icom/icom_defs.h
index 6313ec2de..129637439 100644
--- a/rigs/icom/icom_defs.h
+++ b/rigs/icom/icom_defs.h
@@ -134,7 +134,7 @@
#define S_NXDNVN 0x19 /* Set to NXDN_VN */
#define S_NXDN_N 0x20 /* Set to NXDN-N */
#define S_DCR 0x21 /* Set to DCR */
-#define S_DD 0x22 /* Set to DD 1200Mhz only? */
+#define S_DD 0x22 /* Set to DD 1200 MHz only? */
#define S_R7000_SSB 0x05 /* Set to SSB on R-7000 */
diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c
index b31920bbd..31beb8d57 100644
--- a/rigs/icom/xiegu.c
+++ b/rigs/icom/xiegu.c
@@ -267,7 +267,7 @@ struct rig_caps x108g_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS},
{MHz(400), MHz(470), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, X108G_OTHER_TX_MODES, W(2), W(50), X108G_VFOS, RIG_ANT_2),
@@ -458,7 +458,7 @@ struct rig_caps x6100_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS},
{MHz(400), MHz(470), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, X108G_OTHER_TX_MODES, W(2), W(50), X108G_VFOS, RIG_ANT_2),
@@ -634,7 +634,7 @@ struct rig_caps x6200_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS},
{MHz(400), MHz(470), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, X108G_OTHER_TX_MODES, W(2), W(50), X108G_VFOS, RIG_ANT_2),
@@ -825,7 +825,7 @@ struct rig_caps g90_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS},
{MHz(400), MHz(470), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, X108G_OTHER_TX_MODES, W(2), W(50), X108G_VFOS, RIG_ANT_2),
@@ -1000,7 +1000,7 @@ struct rig_caps x5105_caps =
.rx_range_list2 = { {kHz(30), MHz(199.999999), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS},
{MHz(400), MHz(470), X108G_ALL_RX_MODES, -1, -1, X108G_VFOS}, RIG_FRNG_END,
},
- .tx_range_list2 = { /* needs the 5 mhz channels added */
+ .tx_range_list2 = { /* needs the 5 MHz channels added */
FRQ_RNG_HF(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_6m(2, X108G_OTHER_TX_MODES, W(2), W(100), X108G_VFOS, RIG_ANT_1),
FRQ_RNG_2m(2, X108G_OTHER_TX_MODES, W(2), W(50), X108G_VFOS, RIG_ANT_2),
diff --git a/rigs/kachina/kachina.c b/rigs/kachina/kachina.c
index 01eac0384..b7abd2b6f 100644
--- a/rigs/kachina/kachina.c
+++ b/rigs/kachina/kachina.c
@@ -126,7 +126,7 @@ static int kachina_trans_n(RIG *rig, unsigned char cmd1, const char *data,
}
/*
- * convert a frequency in Hz in the range of 30kHz to 30MHz
+ * convert a frequency in Hz in the range of 30 kHz to 30 MHz
* to DDS value, as expected by the Kachina.
*/
static void freq2dds(freq_t freq, int ant_port, unsigned char fbuf[4])
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index f2d117e54..fcb587196 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -547,7 +547,7 @@ static int powersdr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_VFO_A:
if ((mode == RIG_MODE_PKTUSB || mode == RIG_MODE_PKTLSB) && width > 3000)
{
- // 150Hz on the low end should be enough
+ // 150 Hz on the low end should be enough
// Set high to the width requested
SNPRINTF(buf, sizeof(buf), "ZZFL00150;ZZFH%05d;", (int)width);
}
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index 9ef8f03b4..780ff36e3 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -1245,7 +1245,7 @@ static int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break;
case RIG_MODE_PSK:
- mode = RIG_MODE_PSK; // in "DT3" subband RIG_MODE_PSK = USB # kenwood.c mode but may need kenwwod.c mode table review.
+ mode = RIG_MODE_PSK; // in "DT3" subband RIG_MODE_PSK = USB # kenwood.c mode but may need kenwood.c mode table review.
SNPRINTF(cmd_m, sizeof(cmd_m),
"%s3", dtcmd); /* PSK D Mode - direct PSK keying, USB is "normal", VFO dial is MARK */
break;
@@ -1333,7 +1333,7 @@ static int k3_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
#endif
- width += 9; // rounds to 10Hz
+ width += 9; // rounds to 10 Hz
if (width > 99999) { width = 99999; }
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 3d67090a7..03cbe0d12 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -726,7 +726,7 @@ transaction_quit:
*
* Parameters:
* cmd Same as kenwood_transaction() cmdstr
- * buf Same as kenwwod_transaction() data
+ * buf Same as kenwood_transaction() data
* buf_size Same as kenwood_transaction() datasize
* expected Value of expected string length
*
@@ -1918,7 +1918,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK != err) { RETURNFUNC2(err); }
}
- // Malchite is so slow we don't do the get_freq
+ // Malachite is so slow we don't do the get_freq
// And when we have detected Doppler operations we just set the freq all the time
// This should provide stable timing for set_ptt operation so relay delays are consistent
if (!RIG_IS_MALACHITE && STATE(rig)->doppler == 0)
@@ -2265,7 +2265,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
{
SNPRINTF(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D');
diff = labs(((curr_rit - rit) + (curr_rit - rit) >= 0 ? 5 : -5) /
- 10); // round to nearest 10Hz
+ 10); // round to nearest 10 Hz
rig_debug(RIG_DEBUG_TRACE, "%s: rit=%ld, curr_rit=%ld, diff=%d\n", __func__,
rit, curr_rit, diff);
rig_debug(RIG_DEBUG_TRACE, "%s: rit change loop=%d\n", __func__, diff);
diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c
index f4fea37dd..91d53b521 100644
--- a/rigs/kenwood/th.c
+++ b/rigs/kenwood/th.c
@@ -233,7 +233,7 @@ th_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
freq_sent = freq625;
}
- /* Step needs to be at least 10kHz on higher band, otherwise 5 kHz */
+ /* Step needs to be at least 10 kHz on higher band, otherwise 5 kHz */
step = freq_sent >= MHz(470) ? 4 : step;
freq_sent = freq_sent >= MHz(470) ? (round(freq_sent / 10000) * 10000) :
freq_sent;
diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index fb164decf..1abaf28e7 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -63,8 +63,8 @@ static rmode_t thd72_mode_table[3] =
static pbwidth_t thd72_width_table[3] =
{
- [0] = 10000, // +-5KHz
- [1] = 5000, // +-2.5KHz
+ [0] = 10000, // +-5 kHz
+ [1] = 5000, // +-2.5 kHz
[2] = 10000, // what should this be?
};
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index 5ae158f9f..ab1040a6a 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -64,8 +64,8 @@ static rmode_t thd74_mode_table[10] =
static pbwidth_t thd74_width_table[10] =
{
- [0] = 10000, // +-5KHz
- [1] = 5000, // +-2.5KHz
+ [0] = 10000, // +-5 kHz
+ [1] = 5000, // +-2.5 kHz
[2] = 10000, // FIXME: what should this be?
[3] = 10000, // FIXME: what should this be?
[4] = 10000, // FIXME: what should this be?
diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c
index c9aa67d45..e299b4505 100644
--- a/rigs/kenwood/thf6a.c
+++ b/rigs/kenwood/thf6a.c
@@ -209,7 +209,7 @@ struct rig_caps thf6a_caps =
.tuning_steps = {
/* This table is ordered according to protocol, from '0' to 'b' */
- /* The steps are not available on every band/frequency limit 470MHz */
+ /* The steps are not available on every band/frequency limit 470 MHz */
{THF6_ALL_MODES, kHz(5)},
{THF6_ALL_MODES, kHz(6.25)},
{THF6_ALL_MODES, kHz(8.33)},
diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c
index 2440e50a5..252bcc159 100644
--- a/rigs/kenwood/thf7.c
+++ b/rigs/kenwood/thf7.c
@@ -203,7 +203,7 @@ struct rig_caps thf7e_caps =
.tuning_steps = {
/* This table is ordered according to protocol, from '0' to 'b' */
- /* The steps are not available on every band/frequency limit 470MHz */
+ /* The steps are not available on every band/frequency limit 470 MHz */
{THF7_ALL_MODES, kHz(5)},
{THF7_ALL_MODES, kHz(6.25)},
{THF7_ALL_MODES, kHz(8.33)},
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index ab77a24fc..baadeb82c 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -1221,7 +1221,7 @@ int tmd710_do_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
freq_sent = freq625;
}
- /* Step needs to be at least 10kHz on higher band, otherwise 5 kHz */
+ /* Step needs to be at least 10 kHz on higher band, otherwise 5 kHz */
fo_struct.step = freq_sent >= MHz(470) ? 4 : step;
fo_struct.freq = freq_sent >= MHz(470) ? (round(freq_sent / 10000) * 10000) :
freq_sent;
@@ -1858,7 +1858,7 @@ int tmd710_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t freq)
freq_sent = freq625;
}
- /* Step needs to be at least 10kHz on higher band, otherwise 5 kHz */
+ /* Step needs to be at least 10 kHz on higher band, otherwise 5 kHz */
fo_struct.offset = freq_sent >= MHz(470) ? (round(freq_sent / 10000) * 10000) :
freq_sent;
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index e8e37ad1e..a96a4ab22 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -2368,7 +2368,7 @@ static int malachite_init(RIG *rig)
priv = STATE(rig)->priv;
- priv->no_id = 1; // the Malchite doesn't like the ID; verify cmd
+ priv->no_id = 1; // the Malachite doesn't like the ID; verify cmd
if (retval != RIG_OK) { RETURNFUNC(retval); }
@@ -2447,7 +2447,7 @@ struct rig_caps malachite_caps =
.serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
- // Malchite needs 125ms unless going from low to high band -- see malachite_set_freq
+ // Malachite needs 125ms unless going from low to high band -- see malachite_set_freq
// Do not change this without checking the 300ms delay in malachite_set_freq
.post_write_delay = 250,
.timeout = 3000,
diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c
index 650326644..fa26b0680 100644
--- a/rigs/kit/elektor507.c
+++ b/rigs/kit/elektor507.c
@@ -836,7 +836,7 @@ static void find_P_Q_DIV1N(struct elektor507_priv_data *priv, freq_t freq)
* P:8..2055, best 16..1023 (because of Pump)
For stable operation:
- + REF/Qtotal must not fall below 250kHz (
+ + REF/Qtotal must not fall below 250 kHz (
+ P*(REF/Qtotal) must not be above 400 MHz or below 100 MHz
*/
#if 1
@@ -885,7 +885,7 @@ static void find_P_Q_DIV1N(struct elektor507_priv_data *priv, freq_t freq)
* P:8..2055, best 16..1023 (because of Pump)
For stable operation:
- + REF/Qtotal must not fall below 250kHz (
+ + REF/Qtotal must not fall below 250 kHz (
+ P*(REF/Qtotal) must not be above 400 MHz or below 100 MHz
*/
#if 1
@@ -977,7 +977,7 @@ static void find_P_Q_DIV1N(
double newdelta, delta = fabs((priv->P * (Ref / priv->Q) / priv->Div1N) -
freq4);
- /* For stable operation: Ref/Qtotal must not fall below 250kHz */
+ /* For stable operation: Ref/Qtotal must not fall below 250 kHz */
/* Qmax = (int) ( Ref / 250000); */
for (Qtotal = 2; Qtotal <= Qmax; Qtotal++)
{
diff --git a/rigs/pcr/pcr.c b/rigs/pcr/pcr.c
index f0c73f673..656b34cc7 100644
--- a/rigs/pcr/pcr.c
+++ b/rigs/pcr/pcr.c
@@ -55,7 +55,7 @@
#define MD_P25 '8' /* PCR-2500 Only */
-/* define 2.8kHz, 6kHz, 15kHz, 50kHz, and 230kHz */
+/* define 2.8 kHz, 6 kHz, 15 kHz, 50 kHz, and 230 kHz */
#define FLT_2_8kHz '0'
#define FLT_6kHz '1'
#define FLT_15kHz '2'
@@ -726,7 +726,7 @@ pcr_get_vfo(RIG *rig, vfo_t *vfo)
* Assumes rig!=NULL
*
* K0GMMMKKKHHHmmff00
- * GMMMKKKHHH is frequency GHz.MHz.KHz.Hz
+ * GMMMKKKHHH is frequency GHz.MHz.kHz.Hz
* mm is the mode setting
* 00 = LSB
* 01 = USB
@@ -736,11 +736,11 @@ pcr_get_vfo(RIG *rig, vfo_t *vfo)
* 05 = NFM
* 06 = WFM
* ff is the filter setting
- * 00 = 2.8 Khz (CW USB LSB AM)
- * 01 = 6.0 Khz (CW USB LSB AM NFM)
- * 02 = 15 Khz (AM NFM)
- * 03 = 50 Khz (AM NFM WFM)
- * 04 = 230 Khz (WFM)
+ * 00 = 2.8 kHz (CW USB LSB AM)
+ * 01 = 6.0 kHz (CW USB LSB AM NFM)
+ * 02 = 15 kHz (AM NFM)
+ * 03 = 50 kHz (AM NFM WFM)
+ * 04 = 230 kHz (WFM)
*
*/
diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c
index d81a00666..c2c30d31f 100644
--- a/rigs/tentec/orion.c
+++ b/rigs/tentec/orion.c
@@ -312,8 +312,7 @@ static void start_thread(RIG *rig)
* \param rig
* \brief tt565_open routine
*
- * Open the rig - check f * This backend supports the Ten-Tec Orion (565) and Orion II (566) transceivers.
-irmware version issues
+ * Open the rig - check firmware version issues
*/
int tt565_open(RIG *rig)
{
diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index 3adeea11b..76772a4c2 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -335,8 +335,8 @@ RIG_MODEL(RIG_MODEL_TT565),
},
/* mode/filter list, remember: order matters! */
.filters = {
- /* 9MHz IF filters: 15kHz, 6kHz, 2.4kHz, 1.0kHz */
- /* opt: 1.8kHz, 500Hz, 250Hz */
+ /* 9 MHz IF filters: 15 kHz, 6 kHz, 2.4 kHz, 1.0 kHz */
+ /* opt: 1.8 kHz, 500 Hz, 250 Hz */
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY, kHz(2.4)},
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY, 100},
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY, kHz(6)},
@@ -525,8 +525,8 @@ RIG_MODEL(RIG_MODEL_TT599),
},
/* mode/filter list, remember: order matters! */
.filters = {
- /* 15kHz, 6kHz, 2.4kHz, 1.0kHz */
- /* 9MHz IF filters: 2.4K standard */
+ /* 15 kHz, 6 kHz, 2.4 kHz, 1.0 kHz */
+ /* 9 MHz IF filters: 2.4K standard */
/* optional = 300, 600, 1.8k, 6k, 15k */
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB, kHz(2.4)},
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB, 600},
diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c
index 69a002fc4..4857e189b 100644
--- a/rigs/tentec/tt550.c
+++ b/rigs/tentec/tt550.c
@@ -379,7 +379,7 @@ tt550_init(RIG *rig)
priv->tx_cwbfo = priv->cwbfo = kHz(0.7);
priv->agc = 2; /* medium */
priv->lineout = priv->spkvol = 0.0; /* mute */
- priv->stepsize = 100; /* default to 100Hz tuning step */
+ priv->stepsize = 100; /* default to 100 Hz tuning step */
return RIG_OK;
}
@@ -1744,7 +1744,7 @@ tt550_decode_event(RIG *rig)
{
case KEY_F1_DOWN:
- /* F1 changes the Step size from 1hz to 1mhz */
+ /* F1 changes the Step size from 1 Hz to 1 MHz */
if (priv->stepsize < 10000)
{
/* In powers of ten */
diff --git a/rigs/winradio/winradio.c b/rigs/winradio/winradio.c
index 9e7c273a1..3c47b77e3 100644
--- a/rigs/winradio/winradio.c
+++ b/rigs/winradio/winradio.c
@@ -132,9 +132,9 @@ int wr_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case RMD_FMN: *mode = RIG_MODE_FM; break; /* 15kHz or 17kHz on WR-3100 */
- case RMD_FM6: *mode = RIG_MODE_FM; break; /* 6kHz */
+ case RMD_FM6: *mode = RIG_MODE_FM; break; /* 6 kHz */
- case RMD_FMM: *mode = RIG_MODE_FM; break; /* 50kHz */
+ case RMD_FMM: *mode = RIG_MODE_FM; break; /* 50 kHz */
case RMD_FMW: *mode = RIG_MODE_WFM; break;
diff --git a/rigs/wj/wj.c b/rigs/wj/wj.c
index 51ee82520..ace3a5be4 100644
--- a/rigs/wj/wj.c
+++ b/rigs/wj/wj.c
@@ -159,7 +159,7 @@ static int wj_transaction(RIG *rig, int monitor)
buf[5] |= wj_mode & 0x7;
/* BFO frequency, not sure though */
- wj_bfo = (priv->ifshift.i / 10) + 0x400; /* LSBit is 10Hz, +455kHz */
+ wj_bfo = (priv->ifshift.i / 10) + 0x400; /* LSBit is 10 Hz, +455 kHz */
buf[6] |= (wj_bfo >> 5) & 0x3f;
buf[7] |= (wj_bfo & 0x1f) << 2;
diff --git a/rigs/yaesu/frg8800.c b/rigs/yaesu/frg8800.c
index 4cba501b7..73cde2e48 100644
--- a/rigs/yaesu/frg8800.c
+++ b/rigs/yaesu/frg8800.c
@@ -185,7 +185,7 @@ int frg8800_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* store bcd format in cmd (LSB) */
to_bcd(cmd, freq / 10, 8);
- /* Byte1: 100Hz's and 25Hz step code */
+ /* Byte1: 100 Hz's and 25 Hz step code */
cmd[0] = (cmd[0] & 0xf0) | (1 << ((((long long)freq) % 100) / 25));
/* Frequency set */
diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c
index e42aa5605..911ec8b7c 100644
--- a/rigs/yaesu/ft100.c
+++ b/rigs/yaesu/ft100.c
@@ -603,7 +603,7 @@ int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
memcpy(p_cmd, &ncmd[cmd_index].nseq, YAESU_CMD_LENGTH);
- /* fixed 10Hz bug by OH2MMY */
+ /* fixed 10 Hz bug by OH2MMY */
freq = (int) freq / 10;
to_bcd(p_cmd, freq, 8); /* store bcd format in in p_cmd */
@@ -645,7 +645,7 @@ int ft100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
priv->status.freq[3]);
d1 = strtol(freq_str, NULL, 16);
- d2 = (d1 * 1.25); /* fixed 10Hz bug by OH2MMY */
+ d2 = (d1 * 1.25); /* fixed 10 Hz bug by OH2MMY */
rig_debug(RIG_DEBUG_VERBOSE, "ft100: d1=%"PRIfreq" d2=%"PRIfreq"\n", d1, d2);
diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c
index 3e0b7b072..2677fe98d 100644
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@ -184,10 +184,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x05 } }, /* Select VFO (A) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x05 } }, /* Select VFO (B) */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x06 } }, /* Copy Memory Data to VFO A */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* OP Freq Up 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* OP Freq Up 1MHz */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* OP Freq Down 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* OP Freq Down 1MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* OP Freq Up 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* OP Freq Up 1 MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* OP Freq Down 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* OP Freq Down 1 MHz */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x09 } }, /* RX Clarifier (OFF) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x09 } }, /* RX Clarifier (ON) */
{ 1, { 0x00, 0x00, 0x00, 0x80, 0x09 } }, /* TX Clarifier (OFF) */
@@ -197,10 +197,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x0a } }, /* Set Op Freq */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0c } }, /* OP Mode Set LSB */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x0c } }, /* OP Mode Set USB */
- { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* OP Mode Set CW 2.4KHz */
- { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* OP Mode Set CW 500Hz */
- { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* OP Mode Set AM 6KHz */
- { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* OP Mode Set AM 2.4KHz */
+ { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* OP Mode Set CW 2.4 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* OP Mode Set CW 500 Hz */
+ { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* OP Mode Set AM 6 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* OP Mode Set AM 2.4 kHz */
{ 1, { 0x00, 0x00, 0x00, 0x06, 0x0c } }, /* OP Mode Set FM */
{ 1, { 0x00, 0x00, 0x00, 0x08, 0x0c } }, /* OP Mode Set RTTY LSB */
{ 1, { 0x00, 0x00, 0x00, 0x09, 0x0c } }, /* OP Mode Set RTTY USB */
@@ -208,10 +208,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x0b, 0x0c } }, /* OP Mode Set PKT FM */
{ 1, { 0x00, 0x00, 0x00, 0x80, 0x0c } }, /* Sub VFOB OP Mode Set LSB Added December 2016 */
{ 1, { 0x00, 0x00, 0x00, 0x81, 0x0c } }, /* Sub VFOB OP Mode Set USB Added December 2016 */
- { 1, { 0x00, 0x00, 0x00, 0x82, 0x0c } }, /* Sub VFOB OP Mode Set CW 2.4KHz Added December 2016 */
- { 1, { 0x00, 0x00, 0x00, 0x83, 0x0c } }, /* Sub VFOB OP Mode Set CW 500Hz Added December 2016 */
- { 1, { 0x00, 0x00, 0x00, 0x84, 0x0c } }, /* Sub VFOB OP Mode Set AM 6KHz Added December 2016 */
- { 1, { 0x00, 0x00, 0x00, 0x85, 0x0c } }, /* Sub VFOB OP Mode Set AM 2.4KHz Added December 2016 */
+ { 1, { 0x00, 0x00, 0x00, 0x82, 0x0c } }, /* Sub VFOB OP Mode Set CW 2.4 kHz Added December 2016 */
+ { 1, { 0x00, 0x00, 0x00, 0x83, 0x0c } }, /* Sub VFOB OP Mode Set CW 500 Hz Added December 2016 */
+ { 1, { 0x00, 0x00, 0x00, 0x84, 0x0c } }, /* Sub VFOB OP Mode Set AM 6 kHz Added December 2016 */
+ { 1, { 0x00, 0x00, 0x00, 0x85, 0x0c } }, /* Sub VFOB OP Mode Set AM 2.4 kHz Added December 2016 */
{ 1, { 0x00, 0x00, 0x00, 0x86, 0x0c } }, /* Sub VFOB OP Mode Set FM Added December 2016*/
{ 1, { 0x00, 0x00, 0x00, 0x88, 0x0c } }, /* Sub VFOB OP Mode Set RTTY LSB Added December 2016 */
{ 1, { 0x00, 0x00, 0x00, 0x89, 0x0c } }, /* Sub VFOB OP Mode Set RTTY USB Added December 2016 */
@@ -2365,7 +2365,7 @@ static int ft1000d_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
rig_strrmode(*mode));
// The FT1000D firmware appears to have a bug since the
- // AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ // AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
switch (*fl & (~FT1000D_BW_FMPKTRTTY))
{
case FT1000D_BW_F2400:
@@ -3130,7 +3130,7 @@ static int ft1000d_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
* Get RX bandwidth selection
*
* The FT1000D firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT1000D_BW_FMPKTRTTY))
{
@@ -3305,7 +3305,7 @@ static int ft1000d_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
* Get RX bandwidth selection
*
* The FT1000D firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT1000D_BW_FMPKTRTTY))
{
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index 5f19b55a7..e34d15666 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -850,7 +850,7 @@ static int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
vfo = STATE(rig)->current_vfo;
}
- // round freq to 10Hz intervals due to rig restriction
+ // round freq to 10 Hz intervals due to rig restriction
freq = round(freq / 10.0) * 10.0;
switch (vfo)
@@ -1487,7 +1487,7 @@ static int ft1000mp_set_rxit(RIG *rig, vfo_t vfo, shortfreq_t rit)
priv->p_cmd[0] = rit_freq[0]; // 10 hz
to_bcd_be(rit_freq, rit / 1000, 2);
- priv->p_cmd[1] = rit_freq[0]; // Khz
+ priv->p_cmd[1] = rit_freq[0]; // kHz
priv->p_cmd[2] = direction;
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index fdb6526f7..e36328c3a 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -205,8 +205,8 @@ static const yaesu_cmd_set_t ft747_ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x05 } }, /* select vfo A */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x05 } }, /* select vfo B */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x06 } }, /* memory to vfo*/
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* up 500 khz */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* down 500 khz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* up 500 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* down 500 kHz */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x09 } }, /* clarify off */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x09 } }, /* clarify on */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x0a } }, /* set freq */
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 0ca3a6bd8..4520a9c6c 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -1324,7 +1324,7 @@ static int ft818_817_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
eeprom_ant[0] &= 1 << 1;
break;
- case 0xB: /* FM BCB 76Mhz - 108Mhz, bit 2 */
+ case 0xB: /* FM BCB 76 MHz - 108 MHz, bit 2 */
eeprom_ant[0] &= 1 << 2;
break;
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index a166070d3..ed57a0682 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -37,7 +37,7 @@
* Notes on limitations in RIG control capabilities. These are
* related to the Yaesu's FT847 design, not my program :-)
*
- * 1. Rig opcodes allow only 10Hz resolution.
+ * 1. Rig opcodes allow only 10 Hz resolution.
* 2. Cannot select VFO B
* 3. Using CAT and Tuner controls simultaneously can
* cause problems.
@@ -1285,7 +1285,7 @@ static int get_freq_and_mode(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode,
return n < 0 ? n : -RIG_EPROTO;
}
- /* Remember, this is 10Hz resolution */
+ /* Remember, this is 10 Hz resolution */
*freq = 10 * from_bcd_be(data, 8);
*width = RIG_PASSBAND_NORMAL;
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 63449314c..9597f667a 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -455,7 +455,7 @@ static int ft891_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split,
}
// Get split mode status
- *split = priv->ret_data[2] != '0'; // 1=split, 2=split + 5khz
+ *split = priv->ret_data[2] != '0'; // 1=split, 2=split + 5kHz
rig_debug(RIG_DEBUG_TRACE, "%s: get split = 0x%02x\n", __func__, *split);
*tx_vfo = RIG_VFO_A;
diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c
index ec7cf7bf4..dce1410ce 100644
--- a/rigs/yaesu/ft950.c
+++ b/rigs/yaesu/ft950.c
@@ -147,7 +147,7 @@ struct rig_caps ft950_caps =
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 125, 128, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channels U51-U54 or US1-US4, if available */
{ 130, 130, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channel U55 or US5, if available */
- { 131, 131, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* EU5, 5167.5 KHz Alaska Emergency Freq, if available */
+ { 131, 131, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* EU5, 5167.5 kHz Alaska Emergency Freq, if available */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c
index 0d5ff078b..5de58d7d9 100755
--- a/rigs/yaesu/ft990.c
+++ b/rigs/yaesu/ft990.c
@@ -160,10 +160,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x05 } }, /* Select VFO (A) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x05 } }, /* Select VFO (B) */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x06 } }, /* Copy Memory Data to VFO A */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* OP Freq Up 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* OP Freq Up 1MHz */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* OP Freq Down 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* OP Freq Down 1MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* OP Freq Up 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* OP Freq Up 1 MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* OP Freq Down 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* OP Freq Down 1 MHz */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x09 } }, /* RX Clarifier (OFF) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x09 } }, /* RX Clarifier (ON) */
{ 1, { 0x00, 0x00, 0x00, 0x80, 0x09 } }, /* TX Clarifier (OFF) */
@@ -173,10 +173,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x0a } }, /* Set Op Freq */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0c } }, /* OP Mode Set LSB */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x0c } }, /* OP Mode Set USB */
- { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* OP Mode Set CW 2.4KHz */
- { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* OP Mode Set CW 500Hz */
- { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* OP Mode Set AM 6KHz */
- { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* OP Mode Set AM 2.4KHz */
+ { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* OP Mode Set CW 2.4 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* OP Mode Set CW 500 Hz */
+ { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* OP Mode Set AM 6 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* OP Mode Set AM 2.4 kHz */
{ 1, { 0x00, 0x00, 0x00, 0x06, 0x0c } }, /* OP Mode Set FM */
{ 1, { 0x00, 0x00, 0x00, 0x08, 0x0c } }, /* OP Mode Set RTTY LSB */
{ 1, { 0x00, 0x00, 0x00, 0x09, 0x0c } }, /* OP Mode Set RTTY USB */
@@ -2155,7 +2155,7 @@ int ft990_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
rig_strrmode(*mode));
// The FT990 firmware appears to have a bug since the
- // AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ // AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
switch (*fl & (~FT990_BW_FMPKTRTTY))
{
case FT990_BW_F2400:
@@ -2909,7 +2909,7 @@ int ft990_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
* Get RX bandwidth selection
*
* The FT990 firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT990_BW_FMPKTRTTY))
{
@@ -3084,7 +3084,7 @@ int ft990_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
* Get RX bandwidth selection
*
* The FT990 firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT990_BW_FMPKTRTTY))
{
diff --git a/rigs/yaesu/ft990v12.c b/rigs/yaesu/ft990v12.c
index 8e7a50552..3208cc7bd 100644
--- a/rigs/yaesu/ft990v12.c
+++ b/rigs/yaesu/ft990v12.c
@@ -175,10 +175,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x05 } }, /* 06 06 Select VFO (A) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x05 } }, /* 07 07 Select VFO (B) */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x06 } }, /* 08 08 Copy Memory Data to VFO A */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* 09 09 OP Freq Up 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* 10 0a OP Freq Up 1MHz */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* 11 0b OP Freq Down 0.1MHz */
- { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* 12 0c OP Freq Down 1MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x07 } }, /* 09 09 OP Freq Up 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x07 } }, /* 10 0a OP Freq Up 1 MHz */
+ { 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* 11 0b OP Freq Down 0.1 MHz */
+ { 1, { 0x00, 0x00, 0x01, 0x00, 0x08 } }, /* 12 0c OP Freq Down 1 MHz */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x09 } }, /* 13 0d RX Clarifier (OFF) */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x09 } }, /* 14 0e RX Clarifier (ON) */
{ 1, { 0x00, 0x00, 0x00, 0x80, 0x09 } }, /* 15 0f TX Clarifier (OFF) */
@@ -188,10 +188,10 @@ static const yaesu_cmd_set_t ncmd[] =
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x0a } }, /* 19 13 Set Op Freq */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0c } }, /* 20 14 OP Mode Set LSB */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x0c } }, /* 21 15 OP Mode Set USB */
- { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* 22 16 OP Mode Set CW 2.4KHz */
- { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* 23 17 OP Mode Set CW 500Hz */
- { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* 24 18 OP Mode Set AM 6KHz */
- { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* 25 19 OP Mode Set AM 2.4KHz */
+ { 1, { 0x00, 0x00, 0x00, 0x02, 0x0c } }, /* 22 16 OP Mode Set CW 2.4 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x03, 0x0c } }, /* 23 17 OP Mode Set CW 500 Hz */
+ { 1, { 0x00, 0x00, 0x00, 0x04, 0x0c } }, /* 24 18 OP Mode Set AM 6 kHz */
+ { 1, { 0x00, 0x00, 0x00, 0x05, 0x0c } }, /* 25 19 OP Mode Set AM 2.4 kHz */
{ 1, { 0x00, 0x00, 0x00, 0x06, 0x0c } }, /* 26 1a OP Mode Set FM */
{ 1, { 0x00, 0x00, 0x00, 0x08, 0x0c } }, /* 27 1b OP Mode Set RTTY LSB */
{ 1, { 0x00, 0x00, 0x00, 0x09, 0x0c } }, /* 28 1c OP Mode Set RTTY USB */
@@ -2188,7 +2188,7 @@ int ft990v12_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
rig_strrmode(*mode));
// The FT990 firmware appears to have a bug since the
- // AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ // AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
switch (*fl & (~FT990_BW_FMPKTRTTY))
{
case FT990_BW_F2400:
@@ -2942,7 +2942,7 @@ int ft990v12_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
* Get RX bandwidth selection
*
* The FT990 firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT990_BW_FMPKTRTTY))
{
@@ -3118,7 +3118,7 @@ int ft990v12_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
* Get RX bandwidth selection
*
* The FT990 firmware appears to have a bug since the
- * AM bandwidth for 2400Hz and 6000Hz are interchanged.
+ * AM bandwidth for 2400 Hz and 6000 Hz are interchanged.
*/
switch (p->filter & (~FT990_BW_FMPKTRTTY))
{
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index 6417d523e..e87c933bf 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -6,7 +6,7 @@
* (C) Terry Embry 2008-2009
* (C) Michael Black W9MDB 2015 -- taken from ft950.c
*
- * The FT991 is very much like the FT950 except freq max increases for 440MHz
+ * The FT991 is very much like the FT950 except freq max increases for 440 MHz
* So most of this code is a duplicate of the FT950
*
* This shared library provides an API for communicating
@@ -241,7 +241,7 @@ struct rig_caps ft991_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
- { 118, 127, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5MHz band
+ { 118, 127, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5 MHz band
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 1ae7918c6..81f00b89a 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -244,7 +244,7 @@ struct rig_caps ftdx101d_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
- { 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5MHz band
+ { 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5 MHz band
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c
index 4ceafd0d9..d0fd514af 100644
--- a/rigs/yaesu/ftdx101...
[truncated message content] |
