hamlib-cvs-digest Mailing List for Ham Radio Control Libraries (Page 26)
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
hamlib-cvs-digest — hamlib commit digest
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(57) |
Nov
(27) |
Dec
(25) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(41) |
Feb
(101) |
Mar
(60) |
Apr
(32) |
May
(32) |
Jun
(198) |
Jul
(95) |
Aug
(60) |
Sep
(48) |
Oct
(96) |
Nov
(27) |
Dec
(222) |
| 2002 |
Jan
(180) |
Feb
(46) |
Mar
(68) |
Apr
(11) |
May
(36) |
Jun
(34) |
Jul
(113) |
Aug
(42) |
Sep
(71) |
Oct
(65) |
Nov
(116) |
Dec
(40) |
| 2003 |
Jan
(32) |
Feb
(92) |
Mar
(29) |
Apr
(102) |
May
(21) |
Jun
(34) |
Jul
(3) |
Aug
(60) |
Sep
(30) |
Oct
(62) |
Nov
(57) |
Dec
(33) |
| 2004 |
Jan
(28) |
Feb
(46) |
Mar
(16) |
Apr
(14) |
May
(31) |
Jun
(21) |
Jul
(10) |
Aug
(80) |
Sep
(42) |
Oct
(11) |
Nov
(28) |
Dec
(13) |
| 2005 |
Jan
(35) |
Feb
(26) |
Mar
(20) |
Apr
(118) |
May
(2) |
Jun
(5) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(13) |
Dec
(1) |
| 2006 |
Jan
(9) |
Feb
(25) |
Mar
(22) |
Apr
(6) |
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
(3) |
Oct
(46) |
Nov
(13) |
Dec
(7) |
| 2007 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
|
May
(6) |
Jun
(1) |
Jul
|
Aug
(11) |
Sep
(7) |
Oct
(8) |
Nov
(41) |
Dec
(3) |
| 2008 |
Jan
(27) |
Feb
(16) |
Mar
(13) |
Apr
(23) |
May
(39) |
Jun
(4) |
Jul
(7) |
Aug
(1) |
Sep
(13) |
Oct
(52) |
Nov
(44) |
Dec
(55) |
| 2009 |
Jan
(72) |
Feb
(69) |
Mar
|
Apr
|
May
|
Jun
(13) |
Jul
(1) |
Aug
(6) |
Sep
(15) |
Oct
(11) |
Nov
(31) |
Dec
(20) |
| 2010 |
Jan
(24) |
Feb
(21) |
Mar
(22) |
Apr
(40) |
May
(38) |
Jun
(4) |
Jul
(2) |
Aug
(22) |
Sep
(19) |
Oct
(14) |
Nov
(5) |
Dec
(8) |
| 2011 |
Jan
(14) |
Feb
(36) |
Mar
(6) |
Apr
|
May
|
Jun
(23) |
Jul
(13) |
Aug
(8) |
Sep
(7) |
Oct
|
Nov
(3) |
Dec
(9) |
| 2012 |
Jan
(17) |
Feb
(13) |
Mar
(10) |
Apr
|
May
(1) |
Jun
(14) |
Jul
(4) |
Aug
(12) |
Sep
(2) |
Oct
(24) |
Nov
(14) |
Dec
(2) |
| 2013 |
Jan
(4) |
Feb
(3) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(4) |
Jul
(7) |
Aug
|
Sep
(15) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
|
Feb
(8) |
Mar
(1) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(7) |
Nov
(6) |
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(5) |
Mar
(8) |
Apr
(8) |
May
(2) |
Jun
|
Jul
(4) |
Aug
(7) |
Sep
(8) |
Oct
|
Nov
(6) |
Dec
(4) |
| 2016 |
Jan
(6) |
Feb
(26) |
Mar
(3) |
Apr
(10) |
May
(6) |
Jun
(5) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(4) |
Nov
(3) |
Dec
(10) |
| 2017 |
Jan
(11) |
Feb
(11) |
Mar
(2) |
Apr
(1) |
May
(7) |
Jun
(2) |
Jul
(11) |
Aug
(9) |
Sep
(5) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
(5) |
Feb
(2) |
Mar
(19) |
Apr
(7) |
May
(11) |
Jun
(3) |
Jul
(4) |
Aug
(10) |
Sep
(2) |
Oct
(8) |
Nov
(6) |
Dec
(9) |
| 2019 |
Jan
(9) |
Feb
(6) |
Mar
(2) |
Apr
(4) |
May
(6) |
Jun
(9) |
Jul
(6) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(9) |
| 2020 |
Jan
(15) |
Feb
(1) |
Mar
(18) |
Apr
(33) |
May
(43) |
Jun
(87) |
Jul
(45) |
Aug
(8) |
Sep
(43) |
Oct
(3) |
Nov
(5) |
Dec
(42) |
| 2021 |
Jan
(116) |
Feb
(40) |
Mar
(58) |
Apr
(48) |
May
(29) |
Jun
(2) |
Jul
|
Aug
(22) |
Sep
(18) |
Oct
(1) |
Nov
|
Dec
(3) |
| 2022 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(2) |
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
(6) |
Nov
(2) |
Dec
(9) |
| 2023 |
Jan
(10) |
Feb
|
Mar
|
Apr
(10) |
May
(3) |
Jun
(1) |
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
|
Nov
(2) |
Dec
(3) |
| 2024 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(5) |
Jun
(3) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(9) |
| 2025 |
Jan
(5) |
Feb
(5) |
Mar
|
Apr
(10) |
May
(20) |
Jun
(43) |
Jul
(24) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael B. <mdb...@us...> - 2020-09-11 13:49:04
|
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 975824c61856af7be12459f60296b5fbf15ced00 (commit)
from f9da2d0b82636049c455830fcddb30e5292f9852 (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 975824c61856af7be12459f60296b5fbf15ced00
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Sep 11 08:40:07 2020 -0500
Update rigctl.1 set_ant
diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index ff0b3c6b..7814e960 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -667,7 +667,7 @@ and
.IP
Number is 1-based antenna# (\(oq1\(cq, \(oq2\(cq, \(oq3\(cq, ...).
.IP
-Option depends on rig..for Icom it probably sets the RX only flag. See your manual for specific option values.
+Option depends on rig..for Icom it probably sets the RX only flag as in the IC-7851. See your manual for specific option values. Most rigs don't care about the option.
.
.TP
.BR y ", " get_ant " \(aq" \fIAntenna\fP \(aq
-----------------------------------------------------------------------
Summary of changes:
doc/man1/rigctl.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-11 13:05:05
|
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 f9da2d0b82636049c455830fcddb30e5292f9852 (commit)
from daa3d91cebae658198f1e818bd320f4204fb346f (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 f9da2d0b82636049c455830fcddb30e5292f9852
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Sep 11 08:04:43 2020 -0500
Remove RIG_LEVEL_BRIGHT from dumpmem.c
diff --git a/tests/dumpmem.c b/tests/dumpmem.c
index 97cf6edc..9f965b53 100644
--- a/tests/dumpmem.c
+++ b/tests/dumpmem.c
@@ -397,10 +397,5 @@ int dump_chan(RIG *rig, int chan_num)
printf("BKINDL: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BKINDL)].i);
}
- if (rig_has_set_level(rig, RIG_LEVEL_BRIGHT))
- {
- printf("BRIGHT: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BRIGHT)].i);
- }
-
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
tests/dumpmem.c | 5 -----
1 file changed, 5 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-10 20:32:51
|
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 daa3d91cebae658198f1e818bd320f4204fb346f (commit)
from 2020f291858ebc8d7c98adc1427ce1a57dd199b7 (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 daa3d91cebae658198f1e818bd320f4204fb346f
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Sep 10 15:32:17 2020 -0500
Add RIG_LEVEL_AF to k3.c
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index 08e2a873..3ae0afc8 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -180,7 +180,7 @@ const struct rig_caps k3_caps =
RIG_MODEL(RIG_MODEL_K3),
.model_name = "K3",
.mfg_name = "Elecraft",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -329,7 +329,7 @@ const struct rig_caps k3s_caps =
RIG_MODEL(RIG_MODEL_K3S),
.model_name = "K3S",
.mfg_name = "Elecraft",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -479,7 +479,7 @@ const struct rig_caps k4_caps =
RIG_MODEL(RIG_MODEL_K4),
.model_name = "K4",
.mfg_name = "Elecraft",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -628,7 +628,7 @@ const struct rig_caps kx3_caps =
RIG_MODEL(RIG_MODEL_KX3),
.model_name = "KX3",
.mfg_name = "Elecraft",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -777,7 +777,7 @@ const struct rig_caps kx2_caps =
RIG_MODEL(RIG_MODEL_KX2),
.model_name = "KX2",
.mfg_name = "Elecraft",
- .version = BACKEND_VER ".0",
+ .version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1664,6 +1664,10 @@ int k3_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
snprintf(levelbuf, sizeof(levelbuf), "SQ%03d", (int)(val.f * 29.0f));
break;
+ case RIG_LEVEL_AF:
+ snprintf(levelbuf, sizeof(levelbuf), "AG%03d", (int)(val.f * 250.0f));
+ break;
+
case RIG_LEVEL_RF:
snprintf(levelbuf, sizeof(levelbuf), "RG%03d", (int)(val.f * 250.0f));
break;
@@ -1908,6 +1912,18 @@ int k3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
val->f = (float) lvl / 29.0f;
break;
+ case RIG_LEVEL_AF:
+ retval = kenwood_safe_transaction(rig, "AG", lvlbuf, sizeof(lvlbuf), 5);
+
+ if (retval != RIG_OK)
+ {
+ return retval;
+ }
+
+ sscanf(lvlbuf + 2, "%d", &lvl);
+ val->f = (float) lvl / 250.0f;
+ break;
+
case RIG_LEVEL_RF:
retval = kenwood_safe_transaction(rig, "RG", lvlbuf, sizeof(lvlbuf), 5);
-----------------------------------------------------------------------
Summary of changes:
rigs/kenwood/k3.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-10 15:07:30
|
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 2020f291858ebc8d7c98adc1427ce1a57dd199b7 (commit)
from c9c6b0c47c0e478a67b87c301492f7177c168173 (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 2020f291858ebc8d7c98adc1427ce1a57dd199b7
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Sep 10 10:07:11 2020 -0500
Remove redundant RIG_LEVEL_BRIGHT
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 57f9c32f..b382f9d1 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -880,7 +880,7 @@ enum rig_level_e {
RIG_LEVEL_NOTCHF_RAW = CONSTANT_64BIT_FLAG(36), /*!< \c NOTCHF_RAW -- Notch Freq., arg float [0.0 ... 1.0] */
RIG_LEVEL_MONITOR_GAIN = CONSTANT_64BIT_FLAG(37), /*!< \c MONITOR_GAIN -- Monitor gain (level for monitoring of transmitted audio), arg float [0.0 ... 1.0] */
RIG_LEVEL_NB = CONSTANT_64BIT_FLAG(38), /*!< \c NB -- Noise Blanker level, arg float [0.0 ... 1.0] */
- RIG_LEVEL_BRIGHT = CONSTANT_64BIT_FLAG(39), /*!< \c Display brightness */
+ RIG_LEVEL_39 = CONSTANT_64BIT_FLAG(39), /*!< \c Future use */
RIG_LEVEL_40 = CONSTANT_64BIT_FLAG(40), /*!< \c Future use */
RIG_LEVEL_41 = CONSTANT_64BIT_FLAG(41), /*!< \c Future use */
RIG_LEVEL_42 = CONSTANT_64BIT_FLAG(42), /*!< \c Future use */
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 26df43b9..985121e8 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -139,7 +139,7 @@ struct cmdparams ic705_extcmds[] =
#define IC705_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
#define IC705_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM|RIG_MODE_DSTAR)
#define IC705_OTHER_TX_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
-#define IC705_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_BRIGHT)
+#define IC705_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB)
/*
* IC9700 items that differ from IC7300
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 24a6cd32..059310bc 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2653,11 +2653,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
lvl_sc = S_LVL_MON;
break;
- case RIG_LEVEL_BRIGHT:
- lvl_cn = C_CTL_LVL;
- lvl_sc = S_LVL_BRIGHT;
- break;
-
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__,
rig_strlevel(level));
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index b5959882..90fb245e 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20200906"
+#define BACKEND_VER "20200910"
/*
* defines used by comp_cal_str in rig.c
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index a1f598c2..67959ac3 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -47,6 +47,9 @@
#define F6K_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
+/* PowerSDR differences */
+#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER)
+
static rmode_t flex_mode_table[KENWOOD_MODE_TABLE_MAX] =
{
@@ -628,6 +631,52 @@ int flex6k_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
return err;
}
+/*
+ * powersdr_get_level
+ */
+int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
+{
+ char lvlbuf[KENWOOD_MAX_BUF_LEN];
+ char *cmd;
+ int retval;
+ int len;
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ if (!val)
+ {
+ return -RIG_EINVAL;
+ }
+
+ switch (level)
+ {
+ case RIG_LEVEL_RFPOWER_METER:
+ cmd = "ZZRM5";
+ len = 5;
+ break;
+ default:
+ return kenwood_get_level(rig,vfo,level,val);
+ }
+ retval = kenwood_safe_transaction(rig, cmd, lvlbuf, 10, len + 3);
+ if (retval != RIG_OK)
+ {
+ return retval;
+ }
+ int n;
+ switch (level)
+ {
+ case RIG_LEVEL_RFPOWER_METER:
+ n = sscanf(lvlbuf + len, "%f", &val->f);
+ if (n != 1) {
+ rig_debug(RIG_DEBUG_ERR,"%s: Error parsing RFPOWER from lvlbuf='%s'\n",__func__,lvlbuf);
+ return -RIG_EPROTO;
+ }
+ val->f /= 100;
+ break;
+ }
+ return RIG_OK;
+}
+
/*
* F6K rig capabilities.
@@ -785,7 +834,7 @@ const struct rig_caps powersdr_caps =
.has_get_func = RIG_FUNC_NONE, /* has VOX but not implemented here */
.has_set_func = RIG_FUNC_NONE,
- .has_get_level = F6K_LEVEL_ALL,
+ .has_get_level = POWERSDR_LEVEL_ALL,
.has_set_level = F6K_LEVEL_ALL,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, /* FIXME: parms */
@@ -879,7 +928,8 @@ const struct rig_caps powersdr_caps =
// TODO copy over kenwood_[set|get]_level and modify to handle DSP filter values
// correctly - use actual values instead of indices
.set_level = kenwood_set_level,
- .get_level = kenwood_get_level,
+ .get_level = powersdr_get_level,
//.set_ant = kenwood_set_ant_no_ack,
//.get_ant = kenwood_get_ant,
};
+
diff --git a/src/misc.c b/src/misc.c
index 56c3656a..a8c81175 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -683,7 +683,6 @@ static struct
{ RIG_LEVEL_NOTCHF_RAW, "NOTCHF_RAW" },
{ RIG_LEVEL_MONITOR_GAIN, "MONITOR_GAIN" },
{ RIG_LEVEL_NB, "NB" },
- { RIG_LEVEL_BRIGHT, "BRIGHT" },
{ RIG_LEVEL_NONE, "" },
};
-----------------------------------------------------------------------
Summary of changes:
include/hamlib/rig.h | 2 +-
rigs/icom/ic7300.c | 2 +-
rigs/icom/icom.c | 5 -----
rigs/icom/icom.h | 2 +-
rigs/kenwood/flex6xxx.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++--
src/misc.c | 1 -
6 files changed, 55 insertions(+), 11 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-10 13:44:55
|
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 c9c6b0c47c0e478a67b87c301492f7177c168173 (commit)
via e4727094abac19d25443f337dc2842e014bb229f (commit)
via 42f417730645129a16e79ea285a3a92fc03eebf9 (commit)
via 516779cf03978cdf0aa92264bb1defaff16ddf67 (commit)
via a6d3b183690c7bb544e6c7fc2d614af8da5a11d0 (commit)
via c3ca7ef3a605ed86ba24dd25addb62e3e5593b5b (commit)
from ce18ec7bf55941cc80abcacb0867e68a20772254 (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 c9c6b0c47c0e478a67b87c301492f7177c168173
Merge: e4727094 a6d3b183
Author: Nate Bargmann <n0...@n0...>
Date: Thu Sep 10 08:42:11 2020 -0500
Merge branch 'master' into update_mans
commit e4727094abac19d25443f337dc2842e014bb229f
Author: Nate Bargmann <n0...@n0...>
Date: Thu Sep 10 08:40:04 2020 -0500
Update informational man pages for Hamlib 4.0
diff --git a/doc/man7/hamlib-primer.7 b/doc/man7/hamlib-primer.7
index dea2ee5a..b15a7205 100644
--- a/doc/man7/hamlib-primer.7
+++ b/doc/man7/hamlib-primer.7
@@ -5,7 +5,7 @@
.\"
.\" Please keep this file in sync with doc/getting_started.texi
.\"
-.TH HAMLIB-PRIMER "7" "2018-05-27" "Hamlib" "Hamlib Information Manual"
+.TH HAMLIB-PRIMER "7" "2020-09-08" "Hamlib" "Hamlib Information Manual"
.
.
.SH NAME
@@ -73,11 +73,13 @@ SourceForge.net Hamlib files
.UE
Web page.
.
-As a convenience, release archives are also mirrored at the
-.UR https://github.com/Hamlib/Hamlib/releases
-GitHub Hamlib releases
-.UE
-page.
+.\" It appears as of early September 2020 that the uploaded releases have been
+.\" deleted from GitHub
+'\" As a convenience, release archives are also mirrored at the
+.\" .UR https://github.com/Hamlib/Hamlib/releases
+.\" GitHub Hamlib releases
+'\" .UE
+.\" page.
.
The most recent release is listed first.
.
@@ -87,14 +89,17 @@ The most recent release is listed first.
Testing release candidates (RCs) are posted during the period (often a few
weeks) before a planned release.
.
-Beginning with the 3.2 release, RCs are hosted by the
-.UR https://github.com/Hamlib/Hamlib/releases
-GitHub release archive
-.UE .
+Beginning with the 4.0 release, RCs are hosted by the
+.UR http://sourceforge.net/projects/hamlib/files/hamlib/
+SourceForge.net Hamlib files
+.UE
+Web page.
.
RCs are identifed by having a
-.I ~rc
-suffix.
+.I ~rcX
+suffix where the
+.I X
+is replace by a numeral for successive release candidates.
.
.PP
Daily snapshots of the development repository are available via the World Wide
@@ -140,21 +145,21 @@ None of the meta-data is hidden away on some central server.
.PP
To clone the repository use the following command:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-git clone https://git.code.sf.net/p/hamlib/code hamlib
+.B git clone https://git.code.sf.net/p/hamlib/code hamlib
.EE
-.RE
+.in
.
.PP
or:
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-git clone https://github.com/Hamlib/Hamlib.git
+.B git clone https://github.com/Hamlib/Hamlib.git
.EE
-.RE
+.in
.
.PP
.
@@ -194,18 +199,22 @@ Any is a good reason to build from the source code archive.
.PP
Before going further, this manual assumes familiarity with working from the
command prompt in a Linux/BSD/Unix like system's
-.I shell
-environment, either in a
+.I Bourne shell
+environment (compatible Bourne shells include
+.BR bash (1),
+.BR ksh (1),
+.BR zsh (1),
+and several more) either in a
.I virtual console
(a text only screen with no graphics) or in a
.I terminal
in a desktop environment
-.RB ( xterm ,
-.BR rxvt ,
-.BR konsole ,
-.BR gnome\-terminal ,
-.BR xfce4\-terminal ,
-.BR terminal ,
+.RB ( xterm (1),
+.BR rxvt (1),
+.BR konsole "(1) (included with the KDE desktop),"
+.BR gnome\-terminal (1),
+.BR xfce4\-terminal (1),
+.BR terminal "(1) (included in macOS),"
etc.).
.
If this is new to you, take some time and read up on using the shell.
@@ -250,14 +259,14 @@ or daily development snapshot follows the same set of commands, known as the
.I three step
which are each run from the top-level directory:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-\&./configure
-make
-sudo make install
+.B ./configure
+.B make
+.B sudo make install
.EE
-.RE
+.in
.
.SS configure
.
@@ -279,12 +288,12 @@ command could be lurking elsewhere and we don't want to run that!
.PP
Run:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-\&./configure
+.B ./configure
.EE
-.RE
+.in
.
.PP
from the top-level directory.
@@ -346,12 +355,12 @@ file system hierarchy.
.
Perhaps you want to install to your home directory instead:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-\&./configure \-\-prefix=$HOME/local
+.B ./configure \-\-prefix=$HOME/local
.EE
-.RE
+.in
.
.IP
.BR Note :
@@ -365,7 +374,7 @@ installed to
.IR $HOME/local .
.
.PP
-All of the files will be installed in the
+As a result of this option, all of the files will be installed in the
.I local
directory of your home directory.
.
@@ -381,6 +390,26 @@ or superuser (administrator) privileges are not required when running
On the other hand, some extra work will need to be done so other programs can
use the library.
.
+The utilities that are compiled as a part of the Hamlib build system will work
+as they are
+.I linked
+to the library installed under
+.IR local .
+.
+Running them will require declaring the complete path:
+.
+.PP
+.in +4n
+.EX
+.B local/bin/rigctl
+.EE
+.in
+.
+.PP
+or modifying your shell's
+.I PATH
+environment variable (see the shell tutorial site above).
+.
.\" (TODO: describe library hackery in an appendix).
.
.PP
@@ -397,7 +426,7 @@ combination to scroll back up.
.
Conversely, Shift\-PageDown can be used to scroll down toward the end of the
output and the shell prompt (Shift\-UpArrow/Shift\-DownArrow may also work to
-scroll one line at a time).
+scroll one line at a time (terminal dependent)).
.
.PP
After a fair amount of time, depending on your computer, and a lot of screen
@@ -411,7 +440,7 @@ or some such failure message Hamlib is ready to be compiled.
If there is an error and all of the required packages listed in
.I README.betatester
have been installed, please ask for help on the
-.MT hamlib\-developer@@lists.sourceforge.net
+.MT hamlib\-de...@li...
hamlib-developer mailing list
.ME .
.
@@ -435,12 +464,12 @@ library files and its executable programs.
.PP
Run:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-make
+.B make
.EE
-.RE
+.in
.
.PP
from the top-level directory.
@@ -449,7 +478,7 @@ from the top-level directory.
Any error that causes
.B make
to stop early is cause for a question to the
-.MT hamlib\-developer@@lists.sourceforge.net
+.MT hamlib\-de...@li...
hamlib-developer mailing list
.ME .
.
@@ -460,9 +489,9 @@ will take longer than
.B configure
to complete its run.
.
-As it is a system command, and therefore found in the
-.BR PATH ,
-prefixing
+As it is a system command, and therefore found in the shell's
+.B PATH
+environment variable, prefixing
.B make
with
.I ./
@@ -490,16 +519,44 @@ family of distributions.
.PP
Run:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-sudo make install
+.B sudo make install
.EE
-.RE
+.in
+.
+.PP
+or:
+.
+.PP
+.in +4n
+.EX
+.RB $ " su -l"
+Password:
+.RB # " make install"
+.EE
+.in
.
.PP
as root from the top-level directory.
.
+.IP
+.BR Note :
+The shell session is shown to show the change in prompt from a normal user
+account to the root accout.
+.
+.PP
+The
+.B \-l
+option to
+.B su
+forces a
+.I login
+shell so that environment variables such as
+.I PATH
+are set correctly.
+.
.PP
Running
.B make install
@@ -536,22 +593,22 @@ It too will need to be run with root privileges:
.PP
Run:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-sudo ldconfig
+.B sudo ldconfig
.EE
-.RE
+.in
.
.PP
-as root from any directory.
+as root from any directory or while logged in as root from above.
.
-.PP
+.IP
.BR Note :
Subsequent installations of Hamlib will not need to have
.B ldconfig
run after each installation if a newer version of Hamlib was not installed,
-i.e. when recompiling the same version during development.
+i.e., when recompiling the same version during development.
.
.PP
On some distributions a bit of configuration will be needed before
@@ -637,7 +694,7 @@ executable files generated by running
.B make
freeing up considerable disk space.
.
-.PP
+.IP
.BR Note :
During development of individual source files, it is not necessary to
run
@@ -709,12 +766,12 @@ the needed compiler and linker options are passed as environment variables.
.
.PP
Run:
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-\&../hamlib/configure CFLAGS="-ggdb3 -O0" CXXFLAGS="-ggdb3 -O0"
+.B ../hamlib/configure CFLAGS="-ggdb3 -O0" CXXFLAGS="-ggdb3 -O0"
.EE
-.RE
+.in
.
.PP
from a sibling build directory intended for a debugging build.
@@ -738,7 +795,7 @@ and
.B CXXFLAGS
may be set independently for each compiler.
.
-.PP
+.IP
.BR Note :
There are a number compiler options available for controlling debugging
symbols and setting optimization levels.
@@ -748,7 +805,7 @@ Please consult the compiler's manual for all the details.
.
.SS Compiling for Microsoft Windows
.
-Currently compiling is done on a Debian 8 (Jessie) virtual machine using
+Currently compiling is done on a Debian 10 (Buster) virtual machine using
.UR http://www.mingw.org
MinGW
.UE .
@@ -764,16 +821,18 @@ Pre-compiled binaries for Microsoft Windows 32 and 64 bit architectures
(Windows NT and newer) are available for both official releases and daily
development snapshots.
.
+.PP
Official releases are available through the
.UR http://sourceforge.net/projects/hamlib/files/hamlib/
SourceForge.net file download service
.UE .
.
-As an alternative, official releases are also available though the
-.UR https://github.com/Hamlib/Hamlib/releases
-Hamlib archive at GitHub
-.UE .
+.\"As an alternative, official releases are also available though the
+.\".UR https://github.com/Hamlib/Hamlib/releases
+.\"Hamlib archive at GitHub
+.\".UE .
.
+.PP
Daily development snapshots are available from the
.UR http://n0nb.users.sourceforge.net/
daily snapshots page
@@ -786,7 +845,7 @@ available.
Among its features are selecting which portions of Hamlib are installed.
.
The
-.B PATH
+.I PATH
environment variable will need to be set manually per the included
.I README.w32-bin
or
@@ -799,7 +858,7 @@ extracting installer.
.
.PP
Bug reports and questions about these archives should be sent to the
-.MT hamlib-developer@@lists.sourceforge.net
+.MT ham...@li...
hamlib-developer mailing list
.ME .
.
@@ -811,7 +870,7 @@ radio and rotator control functions for developers of software primarily of
interest to radio amateurs and those interested in radio communications.
.
.PP
-Copyright \(co 2001-2018 Hamlib Group (various contributors)
+Copyright \(co 2001-2020 Hamlib Group (various contributors)
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -831,8 +890,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man7/hamlib-utilities.7 b/doc/man7/hamlib-utilities.7
index 8b369c08..866bdd68 100644
--- a/doc/man7/hamlib-utilities.7
+++ b/doc/man7/hamlib-utilities.7
@@ -5,7 +5,7 @@
.\"
.\" Please keep this file in sync with doc/utility-programs.texi
.\"
-.TH HAMLIB-UTILITIES "7" "2018-05-27" "Hamlib" "Hamlib Information Manual"
+.TH HAMLIB-UTILITIES "7" "2020-09-08" "Hamlib" "Hamlib Information Manual"
.
.
.SH NAME
@@ -26,17 +26,20 @@ library functions both through the
.SM API.
.
.PP
-This page summarizes the two test programs,
+This page summarizes the three test programs,
+.BR ampctl (1)
+for testing amplifier back ends,
.BR rigctl (1)
-for testing radio back ends and
+for testing radio back ends, and
.BR rotctl (1)
-for testing rotator back ends and the two network daemons,
-.BR rigctld (1)
+for testing rotator back ends and the three network daemons,
+.BR ampctld (1),
+.BR rigctld (1),
and
.BR rotcltd (1)
-for radio and rotator access via network sockets.
+for amplifier, radio, and rotator access via network sockets.
.
-Also included are three demonstation utilities,
+Also included are three demonstration utilities,
.BR rigmem (1),
.BR rigsmtr (1),
and
@@ -70,42 +73,40 @@ additional commands.
.
.PP
In its most simple use as a
-.I "command line"
+.I command line
program, rigctl is used to set frequency and mode by typing commands after any
rigctl options:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl F 14205000
-.br
-rigctl M USB 2400
+.B rigctl F 14205000
+.B rigctl M USB 2400
.EE
-.RE
+.in
.
.PP
and then query those values:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl f
-.br
-rigctl m
+.B rigctl f
+.B rigctl m
.EE
-.RE
+.in
.
.PP
Entering
-.I "interactive mode"
+.I interactive mode
is a simple matter of not placing any commands after any rigctl options:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl
+.B rigctl
.EE
-.RE
+.in
.
.PP
Entering interactive mode allows successive commands to be entered without
@@ -121,35 +122,31 @@ library.
.PP
Interactive mode is indicated by the spartan prompt:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
Rig command:
.EE
-.RE
+.in
.
.PP
Commands are given at the prompt and follow the general rule that upper case
letters set a value and lower case letters query a value:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-Rig command: M
-.br
-Mode: USB
-.br
-Passband: 2500
-.sp
-Rig command: m
-.br
+.RB "Rig command: " M
+.RB "Mode: " USB
+.RB "Passband: " 2500
+
+.RB "Rig command: " m
Mode: USB
-.br
Passband: 2500
-.sp
+
Rig command:
.EE
-.RE
+.in
.
.PP
An additional prompt is printed when more information is required by the
@@ -168,7 +165,7 @@ The above examples invoked rigctl without specifying a radio model.
.
This is a feature where the Hamlib internal radio model 1
.I dummy
-is used instead.
+is used.
.
The dummy radio provides a way to test Hamlib functions without the need for
actual radio hardware.
@@ -179,32 +176,29 @@ the actual radio connected to the computer is necessary for debugging.
.PP
For example, to quickly set frequency on an Elecraft K3:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl -m 229 -r /dev/rig F 3900000
+.B rigctl -m 2029 -r /dev/rig F 3900000
.EE
-.RE
+.in
.
.PP
and to query the frequency and then mode:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl -m 229 -r /dev/rig f
-.br
+.B rigctl -m 2029 -r /dev/rig f
3900000
-.sp
-rigctl -m 229 -r /dev/rig m
-.br
+
+.B rigctl -m 2029 -r /dev/rig m
LSB
-.br
2000
.EE
-.RE
+.in
.
-.PP
+.IP
.BR Note :
the returned values do not have the prompt strings associated with interactive
mode as shown above.
@@ -220,40 +214,29 @@ option takes the path to the port device on
.SM POSIX
and the device name on Microsoft Windows.
.
-.PP
+.IP
.BR Note :
A complete list of supported radio models may be seen by use of the
.B -l
option:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigctl -l
-.br
+.B rigctl -l
Rig # Mfg Model Version Status
-.br
1 Hamlib Dummy 0.5 Beta
-.br
2 Hamlib NET rigctl 0.3 Beta
-.br
- 101 Yaesu FT-847 0.5 Beta
-.br
- 103 Yaesu FT-1000D 0.0.6 Alpha
-.br
+ 1001 Yaesu FT-847 0.5 Beta
+ 1003 Yaesu FT-1000D 0.0.6 Alpha
\&.
-.br
\&.
-.br
\&.
-.br
- 2702 Rohde&Schwarz EB200 0.1 Untested
-.br
- 2801 Philips/Simoco PRM8060 0.1 Alpha
-.br
- 2901 ADAT www.adat.ch ADT-200A 1.36 Beta
+ 27002 Rohde&Schwarz EB200 0.1 Untested
+ 28001 Philips/Simoco PRM8060 0.1 Alpha
+ 29001 ADAT www.adat.ch ADT-200A 1.36 Beta
.EE
-.RE
+.in
.
.PP
The list is long so use \f(CWShift\-PageUp\fP/\f(CWShift\-PageDown\fP on
@@ -264,7 +247,7 @@ window on Microsoft Windows) or the output can be piped to
.BR more (1)
or
.BR less (1),
-e.g. \(lq\f(CWrigctl -l | more\fP\(rq to scroll back up the list.
+e.g., \(lq\f(CWrigctl -l | more\fP\(rq to scroll back up the list.
.
The list is sorted numerically by model number since Hamlib 1.2.15.1.
.
@@ -305,40 +288,39 @@ additional commands.
.
.PP
In its most simple use as a
-.I "command line"
+.I command line
program, rotctl is used to set azimuth position and (optionally) elevation by
typing commands after any rotctl options:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl P 145.0 23.0
-.br
-rotctl M 8 25
+.B rotctl P 145.0 23.0
+.B rotctl M 8 25
.EE
-.RE
+.in
.
.PP
and then query those values:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl p
+.B rotctl p
.EE
-.RE
+.in
.
.PP
Entering
-.I "interactive mode"
+.I interactive mode
is a simple matter of not placing any commands after any rotctl options:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl
+.B rotctl
.EE
-.RE
+.in
.
.PP
Entering interactive mode allows successive commands to be entered without
@@ -354,40 +336,34 @@ library.
.PP
Interactive mode is indicated by the spartan prompt:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
Rotator command:
.EE
-.RE
+.in
.
.PP
Commands are given at the prompt:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-Rotator command: M
-.br
-Direction: 16
-.br
-Speed: 60
-.sp
-Rotator command: p
-.br
+.RB "Rotator command: " M
+.RB "Direction: " 16
+.RB "Speed: " 60
+
+.RB "Rotator command: " p
Azimuth: 11.352000
-.br
Elevation: 0.000000
-.sp
-Rotator command: p
-.br
+
+.RB "Rotator command: " p
Azimuth: 27.594000
-.br
Elevation: 0.000000
-.sp
+
Rotator command:
.EE
-.RE
+.in
.
.PP
An additional prompt is printed when more information is required by the
@@ -417,26 +393,24 @@ controller connected to the computer is necessary for debugging.
.PP
For example, to quickly set position for RotorEZ:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl -m 401 -r /dev/rotor P 100.0 0.0
+.B rotctl -m 401 -r /dev/rotor P 100.0 0.0
.EE
-.RE
+.in
.
.PP
and to query the position:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl -m 401 -r /dev/rotor p
-.br
+.B rotctl -m 401 -r /dev/rotor p
100.000000
-.br
0.000000
.EE
-.RE
+.in
.
.PP
The returned values do not have the prompt strings associated with interactive
@@ -453,40 +427,29 @@ option takes the path to the port device on
.SM POSIX
or the device name on Microsoft Windows.
.
-.PP
+.IP
.BR Note :
A complete list of supported rotator models may be seen by use of the
.B -l
option:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rotctl -l
-.br
+.B rotctl -l
Rot # Mfg Model Version Status
-.br
1 Hamlib Dummy 0.5 Beta
-.br
2 Hamlib NET rotctl 0.3 Beta
-.br
201 Hamlib EasycommI 0.3 Beta
-.br
202 Hamlib EasycommII 0.3 Beta
-.br
\&.
-.br
\&.
-.br
\&.
-.br
1201 AMSAT IF-100 0.1 Untested
-.br
1301 LA7LKA ts7400 0.1 Beta
-.br
1401 Celestron NexStar 0.1 Untested
.EE
-.RE
+.in
.
.PP
The list is long so use \f(CWShift\-PageUp\fP/\f(CWShift\-PageDown\fP on
@@ -511,6 +474,21 @@ The complete reference for rotctl can be found in the
manual page.
.
.
+.SH ampctl
+.
+The
+.BR ampctl (1)
+utility is a recent addition to the Hamlib utilities as a part of the 4.0
+development cycle.
+.
+It is intended to test the Hamlib implementation of amplifier control and is
+similar in function to the utilities previously described.
+.
+See the
+.BR ampctl (1)
+manual page for the complete reference.
+.
+.
.SH rigctld
.
The
@@ -698,6 +676,22 @@ The complete reference for rotctld can be found in the
manual page.
.
.
+.SH ampctl
+.
+The
+.BR ampctld (1)
+utility is a recent addition to the Hamlib utilities as a part of the 4.0
+development cycle.
+.
+It provides network socket access for the Hamlib implementation of amplifier
+control and is similar in function to the network utilities previously
+described.
+.
+See the
+.BR ampctld (1)
+manual page for the complete reference.
+.
+.
.SH rigmem
.
.B rigmem
@@ -803,7 +797,7 @@ radio and rotator control functions for developers of software primarily of
interest to radio amateurs and those interested in radio communications.
.
.PP
-Copyright \(co 2001-2018 Hamlib Group (various contributors)
+Copyright \(co 2001-2020 Hamlib Group (various contributors)
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -814,6 +808,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.
.BR less (1),
.BR more (1),
+.BR ampctl (1),
+.BR ampctld (1),
.BR rigctl (1),
.BR rigctld (1),
.BR rotctl (1),
@@ -828,8 +824,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man7/hamlib.7 b/doc/man7/hamlib.7
index 58988ed8..f7c715cb 100644
--- a/doc/man7/hamlib.7
+++ b/doc/man7/hamlib.7
@@ -5,7 +5,7 @@
.\"
.\" Please keep this file in sync with doc/nutshell.texi
.\"
-.TH HAMLIB "7" "2018-05-21" "Hamlib" "Hamlib Information Manual"
+.TH HAMLIB "7" "2020-09-08" "Hamlib" "Hamlib Information Manual"
.
.
.SH NAME
@@ -153,20 +153,21 @@ in a few years.
A major milestone was reached when Hamlib 1.2.0 was released in March 2004.
.
The API and Application Binary Interface (ABI) interfaces have remained stable
-since that time up to the latest release of 3.2 in early 2018.
+since that time up to the release of 3.3 in mid 2018.
+.
+Version 4.0 marks a major change to the ABI and certain changes to the API.
.
.PP
Development continues through the major version number
-.RI 3. x
+.RI 4. x
series and beyond.
.
-While some API tweaks are planned, ABI compatibility with the prior
-.RI 1.2. x
-releases remains a priority.
+The 4.0 release marks a major change in the ABI with several changes for
+additional modes and such that will require client programs that use the C ABI
+to be recompiled/relinked, etc.
.
-Other goals include streamlining the build system (done), improving the SWIG
-generated language bindings (done), improving the overall documentation (this
-man page with more in progress), and other updates as warranted.
+Other goals include improving the overall documentation (this man page with
+more in progress), and other updates as warranted.
.
.PP
The Project is hosted by
@@ -255,28 +256,37 @@ atmosphere for development.
Hamlib's source code is released under two
licenses, the
.B Lesser General Public License
-(LGPL) for the library portion, and the
+(LGPL) version 2.1 for the library portion, and the
.B General Public License
-(GPL) for the utility programs.
+(GPL) version 2 for the utility programs.
.
.PP
The LGPL allows the library to be used (linked) by programs regardless of
their individual license.
.
-However, any contributions to the library source remain under copyleft which
-means that the library source code may not be used in violation of the terms
-of the LGPL.
+However, any contributions to the library source remain under a copyleft
+license which means that the library source code may not be used in violation
+of the terms of the LGPL (see the file
+.B COPYING.LIB
+in the main source directory).
+.
+Concepts learned by studying these sources for the purpose of understanding
+the Hamlib API is not covered nor prohibited by the LGPL, however, directly
+copying LGPL sources into any work that is incompatible with the terms of the
+LGPL is a violation of the terms of the license.
.
.PP
The utility program source files are released under the GPL.
.
Any direct use of these sources must be in a form that complies with the terms
-of the GPL.
+of the GPL (see the file
+.B COPYING
+in the main source directory).
.
Concepts learned by studying these sources for the purpose of understanding
the Hamlib API is not covered nor prohibited by the GPL, however, directly
copying GPL sources into any work that is incompatible with the terms of the
-GPL is prohibited.
+GPL is a violation of the terms of the license.
.
.
.SS Radios with a clone capability
@@ -289,11 +299,11 @@ for cloning the memory contents from radio to another of the same model.
.
A related project,
.UR http://chirp.danplanet.com
-CHIRP
+.B Chirp
.UE ,
aims to support radios with such a clone capability.
.
-Please contact the CHIRP project for support of such radios.
+Please contact the Chirp project for support of such radios.
.
.
.SS Pronouncing Hamlib
@@ -319,11 +329,12 @@ If you're French, the above does not apply! :-)
.SH COPYING
.
This file is part of Hamlib, a project to develop a library that simplifies
-radio and rotator control functions for developers of software primarily of
-interest to radio amateurs and those interested in radio communications.
+radio, rotator, and amplifier control functions for developers of software
+primarily of interest to radio amateurs and those interested in radio
+communications.
.
.PP
-Copyright \(co 2001-2018 Hamlib Group (various contributors)
+Copyright \(co 2001-2020 Hamlib Group (various contributors)
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -338,8 +349,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
commit 42f417730645129a16e79ea285a3a92fc03eebf9
Author: Nate Bargmann <n0...@n0...>
Date: Thu Sep 10 08:36:57 2020 -0500
Update utilities man pages for Hamlib 4.0
diff --git a/doc/man1/ampctl.1 b/doc/man1/ampctl.1
index e44ebcc8..01bcc00f 100644
--- a/doc/man1/ampctl.1
+++ b/doc/man1/ampctl.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, ampctl.c
.\"
-.TH AMPCTL "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH AMPCTL "1" "2020-09-08" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -249,12 +249,12 @@ typed in when in interactive mode or provided as argument(s) in command line
interface mode. In interactive mode commands and their arguments may be
entered on a single line:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-F 14250000
+.B F 14250000
.EE
-.RE
+.in
.
.PP
Since most of the
@@ -274,7 +274,7 @@ backslash, \(oq\\\(cq, to enter a long command name.
Example: Use \(lq\\dump_caps\(rq to see what capabilities this amplifier and
backend support.
.
-.PP
+.IP
.BR Note :
The backend for the amplifier to be controlled, or the amplifier itself may
not support some commands. In that case, the operation will fail with a
@@ -283,22 +283,22 @@ error message.
.
.
.PP
-A simple example:
+A simple example using commands saved to a file (typed text shown in bold):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ cat <<.EOF. >cmds.txt
-> # File of commands
-> F 14250000
-> f
-> l PWRINPUT
-> l PWRFORWARD
-> l SWR
-> \\dump_caps
-> .EOF.
+.RB $ " cat <<.EOF. >cmds.txt"
+.RB > " # File of commands"
+.RB > " F 14250000"
+.RB > " f"
+.RB > " l PWRINPUT"
+.RB > " l PWRFORWARD"
+.RB > " l SWR"
+> \fB\\dump_caps\fP
+.RB > " .EOF."
-$ ampctl -m1 - <cmds.txt
+.RB $ " ampctl -m1 - <cmds.txt"
Amplifier command: # File of commands
@@ -344,7 +344,7 @@ Amplifier command:
$
.EE
-.RE
+.in
.
.
.SS ampctl Commands
@@ -573,19 +573,19 @@ if an error was returned by
.BR Hamlib .
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B ampctl
for am Elecraft KPA-1500 using a USB to serial adapter on Linux in interactive
mode:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ ampctl -m 201 -r /dev/ttyUSB1
+.RB $ " ampctl -m 201 -r /dev/ttyUSB1"
.EE
-.RE
+.in
.
.PP
Start
@@ -594,12 +594,12 @@ for an Elecraft KPA-1500 using COM1 on MS Windows while generating TRACE
output to
.IR stderr :
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-> ampctl -m 201 -r COM1 -vvvvv
+.RB > " ampctl -m 201 -r COM1 -vvvvv"
.EE
-.RE
+.in
.
.PP
Connect to a running
@@ -607,12 +607,12 @@ Connect to a running
with amplifier model 2 (\(lqNET ampctl\(rq) on the local host and specifying
the TCP port, setting frequency and mode:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ ampctl -m 2 -r localhost:4531 F 7253500
+.RB $ " ampctl -m 2 -r localhost:4531 F 7253500"
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -640,7 +640,7 @@ Copyright \(co 2000-2011 Stephane Fillod
.br
Copyright \(co 2000-2018 the Hamlib Group (various contributors)
.br
-Copyright \(co 2010-2019 Nate Bargmann
+Copyright \(co 2010-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -658,8 +658,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/ampctld.1 b/doc/man1/ampctld.1
index 5c66324a..31d97844 100644
--- a/doc/man1/ampctld.1
+++ b/doc/man1/ampctld.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, ampctld.c
.\"
-.TH AMPCTLD "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH AMPCTLD "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -402,16 +402,15 @@ needed values. In practice, reliable results are obtained by terminating each
command string with a newline character, \(oq\\n\(cq.
.
.PP
-Example set frequency and mode commands (Perl code):
+Example set frequency and mode commands (Perl code (typed text shown in bold)):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "F 14250000\\n";
-.br
-print $socket "\\\\set_powerstat 1\\n"; # escape leading '\\'
+\fBprint $socket "F 14250000\\n";\fP
+\fBprint $socket "\\\\set_powerstat 1\\n";\fP # escape leading '\\'
.EE
-.RE
+.in
.
.PP
A one line response will be sent as a reply to
@@ -434,14 +433,13 @@ is the Hamlib error code.
.PP
Example get frequency (Perl code):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "f\\n";
-.br
+\fBprint $socket "f\\n";\fP
"14250000\\n"
.EE
-.RE
+.in
.
.PP
Most
@@ -509,16 +507,14 @@ An example response to a
.B set_frequency
command sent from the shell prompt (note the prepended \(oq+\(cq):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "+F 14250000" | nc -w 1 localhost 4531
-.br
+$ \fBecho "+F 14250000" | nc -w 1 localhost 4531\fP
set_freq: 14250000
-.br
RPRT 0
.EE
-.RE
+.in
.
.PP
In this case the long command name and values are returned on the first line
@@ -530,18 +526,15 @@ An example response to a
.B get_freq
query:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "+\\get_freq" | nc -w 1 localhost 4531
-.br
+$ \fBecho "+\\get_freq" | nc -w 1 localhost 4531\fP
get_freq:
-.br
Frequency(Hz): 14250000
-.br
RPRT 0
.EE
-.RE
+.in
.
.IP
.BR Note :
@@ -600,34 +593,34 @@ For example, invoking a
.B get_freq
query with a leading \(oq;\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_freq:;Frequency(Hz): 14250000;RPRT 0
.EE
-.RE
+.in
.
.PP
Or, using the pipe character \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_freq:|Frequency(Hz): 14250000|RPRT 0
.EE
-.RE
+.in
.
.PP
And a
.B set_freq
command prepended with a \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
set_freq: 14250000|RPRT 0
.EE
-.RE
+.in
.
.PP
Such a format will allow reading a response as a single event using a preferred
@@ -659,30 +652,30 @@ sent to and received from the amplifier which is very useful for amplifier
backend library development and may be requested by the developers.
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B ampctld
for an Elecraft KPA-1500 using a USB-to-serial adapter and backgrounding:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ ampctld -m 201 -r /dev/ttyUSB1 &
+.RB $ " ampctld -m 201 -r /dev/ttyUSB1 &"
.EE
-.RE
+.in
.
.PP
Start
.B ampctld
for an Elecraft KPA-1500 using COM2 on MS Windows:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ ampctld -m 201 -r COM2
+.RB $ " ampctld -m 201 -r COM2"
.EE
-.RE
+.in
.
.PP
Connect to the already running
@@ -690,12 +683,12 @@ Connect to the already running
and set the frequency to 14.266 MHz with a 1 second read timeout using the
default protocol from the shell prompt:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "\\set_freq 14266000" | nc -w 1 localhost 4531
+$ \fBecho "\\set_freq 14266000" | nc -w 1 localhost 4531\fP
.EE
-.RE
+.in
.
.PP
Connect to a running
@@ -704,12 +697,12 @@ with
.B ampctl
on the local host:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ ampctl -m2
+.RB $ " ampctl -m2"
.EE
-.RE
+.in
.
.
.SH SECURITY
@@ -765,7 +758,7 @@ Copyright \(co 2000-2010 Stephane Fillod
.br
Copyright \(co 2000-2018 the Hamlib Group (various contributors)
.br
-Copyright \(co 2011-2019 Nate Bargmann
+Copyright \(co 2011-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -783,8 +776,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index c57eaf44..ff0b3c6b 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigctl.c
.\"
-.TH RIGCTL "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGCTL "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -284,7 +284,7 @@ Set verbose mode, cumulative (see
below).
.TP
.BR \-Y "," \-\-\ignore\-err
-Ignores rig open errors
+Ignores rig open errors
.
.TP
.BR \-Z ", " \-\-debug\-time\-stamps
@@ -337,12 +337,12 @@ typed in when in interactive mode or provided as argument(s) in command line
interface mode. In interactive mode commands and their arguments may be
entered on a single line:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-M LSB 2400
+.B M LSB 2400
.EE
-.RE
+.in
.
.PP
Since most of the
@@ -360,7 +360,7 @@ backslash, \(oq\\\(cq, to enter a long command name.
Example: Use \(lq\\dump_caps\(rq to see what capabilities this radio and
backend support.
.
-.PP
+.IP
.BR Note :
The backend for the radio to be controlled, or the radio itself may not
support some commands. In that case, the operation will fail with a
@@ -383,19 +383,19 @@ up until the end of the current line including the \(oq#\(cq character is
ignored.
.
.PP
-A simple example:
+A simple example (typed text is in bold):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ cat <<.EOF. >cmds.txt
-> # File of commands
-> v f m # query rig
-> V VFOB F 14200000 M CW 500 # set rig
-> v f m # query rig
-> .EOF.
+.RB $ " cat <<.EOF. >cmds.txt"
+.RB > " # File of commands"
+.RB > " v f m # query rig"
+.RB > " V VFOB F 14200000 M CW 500 # set rig"
+.RB > " v f m # query rig"
+.RB > " .EOF."
-$ rigctl -m1 - <cmds.txt
+.RB $ " rigctl -m1 - <cmds.txt"
v VFOA
@@ -416,7 +416,7 @@ m CW
$
.EE
-.RE
+.in
.
.
.SS rigctl Commands
@@ -498,17 +498,17 @@ In VFO mode (see
.B \-\-vfo
option above) only a single VFO parameter is required:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-$ rigctl -m 229 -r /dev/rig -o
+.RB $ " rigctl -m 229 -r /dev/rig -o"
Rig command: V
VFO: VFOB
Rig command:
.EE
-.RE
+.in
.
.TP
.BR v ", " get_vfo
@@ -1119,7 +1119,7 @@ Get
.RI \(aq Status \(aq
.IP
Returns Status as 1 if vfo option is on and 0 if vfo option is off.
-This command reflects the -o switch for rigctl and ritctld and can be dynamically changed by
+This command reflects the -o switch for rigctl and ritctld and can be dynamically changed by
.B set_vfo_opt.
.
.TP
@@ -1128,7 +1128,7 @@ Set
.RI \(aq Status \(aq
.IP
Set vfo option Status 1=on or 0=off
-This is the same as using the -o switch for rigctl and ritctld.
+This is the same as using the -o switch for rigctl and ritctld.
This can be dyamically changed while running.
.
.TP
@@ -1252,18 +1252,18 @@ if an error was returned by
.BR Hamlib .
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B rigctl
for a Yaesu FT-920 using a USB to serial adapter on Linux in interactive mode:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctl -m 114 -r /dev/ttyUSB1
+.RB $ " rigctl -m 1014 -r /dev/ttyUSB1"
.EE
-.RE
+.in
.
.PP
Start
@@ -1271,12 +1271,12 @@ Start
for a Yaesu FT-920 using COM1 on MS Windows while generating TRACE output to
.IR stderr :
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-> rigctl -m 114 -r COM1 -vvvvv
+.RB > " rigctl -m 1014 -r COM1 -vvvvv"
.EE
-.RE
+.in
.
.PP
Start
@@ -1284,12 +1284,12 @@ Start
for a Yaesu FT-920 using a USB to serial adapter while setting baud rate and
stop bits:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctl -m 114 -r /dev/ttyUSB1 -s 4800 -C stop_bits=2
+.RB $ " rigctl -m 1014 -r /dev/ttyUSB1 -s 4800 -C stop_bits=2"
.EE
-.RE
+.in
.
.PP
Start
@@ -1299,12 +1299,12 @@ terminator for the
.B w
command:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctl -m 229 -r /dev/ttyUSB0 -t';'
+.RB $ " rigctl -m 2029 -r /dev/ttyUSB0 -t';'"
.EE
-.RE
+.in
.
.PP
Connect to a running
@@ -1312,12 +1312,12 @@ Connect to a running
with radio model 2 (\(lqNET rigctl\(rq) on the local host and specifying the
TCP port, setting frequency and mode:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctl -m 2 -r localhost:4532 F 7253500 M LSB 0
+.RB $ " rigctl -m 2 -r localhost:4532 F 7253500 M LSB 0"
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -1348,7 +1348,7 @@ Copyright \(co 2000-2011 Stephane Fillod
.br
Copyright \(co 2000-2018 the Hamlib Group (various contributors)
.br
-Copyright \(co 2010-2019 Nate Bargmann
+Copyright \(co 2010-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -1366,8 +1366,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigctlcom.1 b/doc/man1/rigctlcom.1
index 305ffdbf..7d63037d 100644
--- a/doc/man1/rigctlcom.1
+++ b/doc/man1/rigctlcom.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigctlcom.c
.\"
-.TH RIGCTLCOM "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGCTLCOM "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -108,12 +108,12 @@ to the other com port of the virtual pair.
Virtual serial ports on POSIX systems can be done with
.BR socat (1):
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-$ socat -d -d pty,raw,echo=0 pty,raw,echo=0
+.RB $ " socat -d -d pty,raw,echo=0 pty,raw,echo=0"
.EE
-.RE
+.in
.
.IP
See this
@@ -342,23 +342,23 @@ attaching to COM10 and using the TS-2000 emulator attached to COM9 (assumes
virtual serial/COM ports pipe has been created with the proper utility
as described above):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctlcom -m 4 -R COM9 -S 115200
+.RB $ " rigctlcom -m 4 -R COM9 -S 115200"
.EE
-.RE
+.in
.
.PP
The following diagram shows the communications flow that allows N1MM Logger+
to communicate with a radio connected to Flrig:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
Flrig -><- rigctlcom -> COM9 <- virt_port_pipe -> COM10 <- N1MM
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -385,7 +385,7 @@ Copyright \(co 2000-2011 Stephane Fillod
.br
Copyright \(co 2000-2018 the Hamlib Group (various contributors)
.br
-Copyright \(co 2010-2019 Nate Bargmann
+Copyright \(co 2010-2020 Nate Bargmann
.br
Copyright \(co 2019 Michael Black W9MDB
.
@@ -405,8 +405,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1
index 5813636a..959b2425 100644
--- a/doc/man1/rigctld.1
+++ b/doc/man1/rigctld.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigctld.c
.\"
-.TH RIGCTLD "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGCTLD "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -207,35 +207,58 @@ Use
.I IPADDR
as the listening IP address.
.IP
-The default is ANY.
+The default is ANY (0.0.0.0).
.IP
-Can be run and connected to like this:
+.B rigctld
+can be run and connected to like this:
+.
.IP
-.nf
+.EX
rigctld
- rigctl -m 2
- rigctl -m 2 -r 127.0.0.1
- rigctl -m 2 -r localhost
- rigctl -m 2 -r 192.168.1.1 (local IP address)
- rigctl -m 2 -r ::1 (does not work on Linux as does not listen on IPV6 by default)
-.BR
+.
+.in +4n
+rigctl -m 2
+rigctl -m 2 -r 127.0.0.1
+rigctl -m 2 -r localhost
+rigctl -m 2 -r 192.168.1.1 (local IP address)
+rigctl -m 2 -r ::1 (on Linux rigctld doesn't listen on IPV6 by default)
+.in
+.
+.IP
rigctld -T 127.0.0.1
- rigctl -m 2
- rigctl -m 2 -r 127.0.0.1
- Exceptions:
- rigctl -m 2 -r localhost (only works if localhost is IPV4 address)
-.BR
+.in +4n
+rigctl -m 2
+rigctl -m 2 -r 127.0.0.1
+.EE
+Exceptions:
+.EX
+rigctl -m 2 -r localhost (only works if localhost is IPV4 address)
+.EE
+.in
+.
+.IP
+.EX
rigctld -T localhost (will set up on IPV4 or IPV6 based on localhost)
- rigctl -m 2
- rigctl -m 2 -r localhost
- rigctl -m 2 ip6-localhost
- Exceptions:
- rigctl -m 2 -r 127.0.0.1 (only works if localhost is IPV4 address)
- rigctl -m 2 -r ::1 (only works localhost is IPV6 address)
-.BR
-On Linux only where ip6-localhost fe00::0
+.in +4n
+rigctl -m 2
+rigctl -m 2 -r localhost
+rigctl -m 2 ip6-localhost
+.EE
+Exceptions:
+.EX
+rigctl -m 2 -r 127.0.0.1 (only works if localhost is IPV4 address)
+rigctl -m 2 -r ::1 (only works localhost is IPV6 address)
+.EE
+.in
+.
+.IP
+On Linux only where ip6-localhost is fe00::0:
+.EX
rigctld -T ip6-localhost
- rigctl -m 2 -r ip6-localhost
+.in +4n
+rigctl -m 2 -r ip6-localhost
+.in
+.EE
.
.TP
.BR \-t ", " \-\-port = \fInumber\fP
@@ -460,8 +483,8 @@ In VFO mode (see
.B \-\-vfo
option above) only a single VFO parameter is required:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
$ rigctl -m 229 -r /dev/rig -o
@@ -470,7 +493,7 @@ VFO: VFOB
Rig command:
.EE
-.RE
+.in
.
.TP
.BR v ", " get_vfo
@@ -1049,7 +1072,7 @@ Set
.RI \(aq Status \(aq
.IP
Set vfo option Status 1=on or 0=off
-This is the same as using the -o switch for rigctl and ritctld.
+This is the same as using the -o switch for rigctl and ritctld.
This can be dyamically changed while running.
.
.
@@ -1089,16 +1112,15 @@ needed values. In practice, reliable results are obtained by terminating each
command string with a newline character, \(oq\\n\(cq.
.
.PP
-Example set frequency and mode commands (Perl code):
+Example set frequency and mode commands (Perl code (typed text shown in bold)):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "F 14250000\\n";
-.br
-print $socket "\\\\set_mode LSB 2400\\n"; # escape leading '\\'
+\fBprint $socket "F 14250000\\n";\fP
+\fBprint $socket "\\\\set_mode LSB 2400\\n";\fP # escape leading '\\'
.EE
-.RE
+.in
.
.PP
A one line response will be sent as a reply to
@@ -1121,14 +1143,13 @@ is the Hamlib error code.
.PP
Example get frequency (Perl code):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "f\\n";
-.br
+\fBprint $socket "f\\n";\fP
"14250000\\n"
.EE
-.RE
+.in
.
.PP
Most
@@ -1190,16 +1211,14 @@ An example response to a
.B set_mode
command sent from the shell prompt (note the prepended \(oq+\(cq):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "+M USB 2400" | nc -w 1 localhost 4532
-.br
+$ \fBecho "+M USB 2400" | nc -w 1 localhost 4532\fP
set_mode: USB 2400
-.br
RPRT 0
.EE
-.RE
+.in
.
.PP
In this case the long command name and values are returned on the first line
@@ -1211,20 +1230,16 @@ An example response to a
.B get_mode
query:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "+\\get_mode" | nc -w 1 localhost 4532
-.br
+$ \fBecho "+\\get_mode" | nc -w 1 localhost 4532\fP
get_mode:
-.br
Mode: USB
-.br
Passband: 2400
-.br
RPRT 0
.EE
-.RE
+.in
.
.IP
.BR Note :
@@ -1283,34 +1298,34 @@ For example, invoking a
.B get_mode
query with a leading \(oq;\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_mode:;Mode: USB;Passband: 2400;RPRT 0
.EE
-.RE
+.in
.
.PP
Or, using the pipe character \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_mode:|Mode: USB|Passband: 2400|RPRT 0
.EE
-.RE
+.in
.
.PP
And a
.B set_mode
command prepended with a \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
set_mode: USB 2400|RPRT 0
.EE
-.RE
+.in
.
.PP
Such a format will allow reading a response as a single event using a preferred
@@ -1371,18 +1386,18 @@ sent to and received from the radio which is very useful for radio backend
library development and may be requested by the developers.
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B rigctld
for a Yaesu FT-920 using a USB-to-serial adapter and backgrounding:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctld -m 114 -r /dev/ttyUSB1 &
+.RB $ " rigctld -m 1014 -r /dev/ttyUSB1 &"
.EE
-.RE
+.in
.
.PP
Start
@@ -1390,24 +1405,24 @@ Start
for a Yaesu FT-920 using a USB-to-serial adapter while setting baud rate and
stop bits, and backgrounding:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctld -m 114 -r /dev/ttyUSB1 -s 4800 -C stop_bits=2 &
+.RB $ " rigctld -m 1014 -r /dev/ttyUSB1 -s 4800 -C stop_bits=2 &"
.EE
-.RE
+.in
.
.PP
Start
.B rigctld
for an Elecraft K3 using COM2 on MS Windows:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctld -m 229 -r COM2
+.RB $ " rigctld -m 2029 -r COM2"
.EE
-.RE
+.in
.
.PP
Connect to the already running
@@ -1415,12 +1430,12 @@ Connect to the already running
and set the frequency to 14.266 MHz with a 1 second read timeout using the
default protocol from the shell prompt:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "\\set_freq 14266000" | nc -w 1 localhost 4532
+$ \fBecho "\\set_freq 14266000" | nc -w 1 localhost 4532\P
.EE
-.RE
+.in
.
.PP
Connect to a running
@@ -1429,12 +1444,12 @@ with
.B rigctl
on the local host:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rigctl -m2
+.RB $ " rigctl -m2"
.EE
-.RE
+.in
.
.
.SH SECURITY
@@ -1490,7 +1505,7 @@ Copyright \(co 2000-2010 Stephane Fillod
.br
Copyright \(co 2000-2018 the Hamlib Group (various contributors)
.br
-Copyright \(co 2011-2019 Nate Bargmann
+Copyright \(co 2011-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -1508,8 +1523,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigmem.1 b/doc/man1/rigmem.1
index 7f093471..c22be596 100644
--- a/doc/man1/rigmem.1
+++ b/doc/man1/rigmem.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigmem.c
.\"
-.TH RIGMEM "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGMEM "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -268,7 +268,7 @@ communications.
.PP
Copyright \(co 2003-2011 Stephane Fillod
.br
-Copyright \(co 2007,2019 Nate Bargmann
+Copyright \(co 2007,2019-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -284,8 +284,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigsmtr.1 b/doc/man1/rigsmtr.1
index d1998a60..68d9ad41 100644
--- a/doc/man1/rigsmtr.1
+++ b/doc/man1/rigsmtr.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigsmtr.c
.\"
-.TH RIGSMTR "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGSMTR "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -239,81 +239,60 @@ if the radio doesn't have the required capabilities.
.
Collect S-Meter readings on a TS\-850 while an EasycommII rotator makes a full
360\(de rotation and record measurements in the file
-.IR csmtr :
+.I csmtr
+(typed text shown in bold):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigsmtr \-m 209 \-r /dev/ttyS1 \-M 202 > csmtr
+.RB $ " rigsmtr \-m 2009 \-r /dev/ttyS1 \-M 202 > csmtr"
.EE
-.RE
+.in
.
.PP
After completion the file
.I csmtr
contains lines such as:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
0 \-47
-.br
30 \-40
-.br
60 \-22
-.br
90 \-3
-.br
120 10
-.br
150 1
-.br
180 \-11
-.br
210 \-24
-.br
240 \-35
-.br
270 \-42
-.br
300 \-48
-.br
330 \-51
-.br
360 \-49
.EE
-.RE
+.in
.
.PP
The results can be plotted with
.BR gnuplot (1):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-gnuplot
-.br
-set angles degrees
-.br
-set polar
-.br
-set grid polar 15.
-.br
-unset border
-.br
-unset param
-.br
-set style data line
-.br
-set rrange [-60:60]
-.br
-set xrange [-60:60]
-.br
-set yrange [-60:60]
-.br
-.RI plot " csmtr"
+.RB $ " gnuplot"
+.B set angles degrees
+.B set polar
+.B set grid polar 15.
+.B unset border
+.B unset param
+.B set style data line
+.B set rrange [-60:60]
+.B set xrange [-60:60]
+.B set yrange [-60:60]
+.B plot csmtr
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -337,7 +316,7 @@ communications.
.PP
Copyright \(co 2007-2009 Stephane Fillod
.br
-Copyright \(co 2018,2019 Nate Bargmann
+Copyright \(co 2018-2020 Nate Bargmann
.PP
This is free software; see the file COPYING for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -354,8 +333,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rigswr.1 b/doc/man1/rigswr.1
index d593d3c6..fa996434 100644
--- a/doc/man1/rigswr.1
+++ b/doc/man1/rigswr.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rigswr.c
.\"
-.TH RIGSWR "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH RIGSWR "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -242,49 +242,45 @@ if the rig doesn't have the required capabilities.
.
Scans frequencies between 14.000 MHz and 14.200 MHz with 50 kHz step on a
TS-850 and records VSWR measurements in file
-.IR cswr .
+.I cswr
+(typed text shown in bold):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-rigswr -m 209 -r /dev/ttyS1 14000000 14200000 50000 > cswr
+.RB $ " rigswr -m 2009 -r /dev/ttyS1 14000000 14200000 50000 > cswr"
.EE
-.RE
+.in
.
.PP
-After completion, cswr file contains the following lines:
+After completion,
+.I cswr
+contains the following lines:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
14000000 1.50
-.br
14050000 1.31
-.br
14100000 1.22
-.br
14150000 1.07
-.br
14200000 1.07
.EE
-.RE
+.in
.
.PP
The result can be plotted with
.BR gnuplot (1):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-gnuplot
-.br
-set data style linespoints
-.br
-set grid
-.br
-.RI plot " cswr"
+.RB $ " gnuplot"
+.B set data style linespoints
+.B set grid
+.B plot cswr
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -314,7 +310,7 @@ Copyright \(co 2004 Thierry Leconte
.br
Copyright \(co 2004-2011 Stephane Fillod
.br
-Copyright \(co 2007,2018,2019 Nate Bargmann
+Copyright \(co 2007,2018-2020 Nate Bargmann
.PP
This is free software; see the file COPYING for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -330,8 +326,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rotctl.1 b/doc/man1/rotctl.1
index 8403ac6b..669ad3c8 100644
--- a/doc/man1/rotctl.1
+++ b/doc/man1/rotctl.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rotctl.c
.\"
-.TH ROTCTL "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH ROTCTL "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -252,14 +252,14 @@ Commands can be entered either as a single char, or as a long command name.
The commands are not prefixed with a dash as the options are. They may be
typed in when in interactive mode or provided as argument(s) in command line
interface mode. In interactive mode commands and their arguments may be
-entered on a single line:
+entered on a single line (typed text shown in bold):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-P 123 45
+.B P 123 45
.EE
-.RE
+.in
.
.PP
Since most of the
@@ -277,7 +277,7 @@ backslash, \(oq\\\(cq, to enter a long command name.
Example: Use \(lq\\get_info\(rq in interactive mode to see the rotator's
information.
.
-.PP
+.IP
.BR Note :
The backend for the rotator to be controlled, or the rotator itself may not
support some commands. In that case, the operation will fail with a
@@ -302,17 +302,17 @@ ignored.
.PP
A simple example:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ cat <<.EOF. >cmds.txt
-> # File of commands
-> set_pos 180.0 10.0 # rotate
-> pause 30 # wait for action to complete
-> get_pos # query rotator
-> .EOF.
+.RB $ " cat <<.EOF. >cmds.txt"
+.RB > " # File of commands"
+.RB > " set_pos 180.0 10.0 # rotate"
+.RB > " pause 30 # wait for action to complete"
+.RB > " get_pos # query rotator"
+.RB > .EOF.
-$ rotctl -m 1 - <cmds.txt
+.RB $ " rotctl -m 1 - <cmds.txt"
set_pos 180.0 10.0
pause 30
@@ -321,7 +321,7 @@ get_pos 180.000000
$
.EE
-.RE
+.in
.
.
.SS Rotator Commands
@@ -357,12 +357,13 @@ Elevation can be -20 to 210 depending on the rotator.
.IP
For example:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-P 163.0 41.0
+.B P 163.0 41.0
.EE
-.RE
+.in
+.
.IP
.BR Note :
If the rotator does not support setting elevation (most do not) supply
@@ -474,21 +475,22 @@ which should be an even numbered integer value between 2 and 12.
.IP
For example:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-L -170.0 -85.0 12
+.B L -170.0 -85.0 12
.EE
-.RE
+.in
+.
.IP
returns:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
Locator: AA55AA00AA00
.EE
-.RE
+.in
.
.TP
.BR l ", " loc2lonlat " \(aq" \fILocator\fP \(aq
@@ -508,21 +510,23 @@ expressed as a negative value.
.IP
For example:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-l AA55AA00AA00
+.B l AA55AA00AA00
.EE
-.RE
+.in
+.
.IP
returns:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
Longitude: -169.999983 Latitude: -84.999991
.EE
-.RE
+.in
+.
.IP
.BR Note :
Despite the use of double precision variables internally, some rounding error
@@ -737,30 +741,30 @@ if an error was returned by
.BR Hamlib .
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B rotctl
for RotorEZ using the first serial port on Linux:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rotctl -m 401 -r /dev/ttyS0
+.RB $ " rotctl -m 401 -r /dev/ttyS0"
.EE
-.RE
+.in
.
.PP
Start
.B rotctl
for RotorEZ using COM2 on MS Windows:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rotctl -m 401 -r COM2
+.RB > " rotctl -m 401 -r COM2"
.EE
-.RE
+.in
.
.PP
Connect to a running
@@ -768,12 +772,12 @@ Connect to a running
with rotator model 2 (\(lqNET rotctl\(rq) on the local host and specifying the
TCP port, and querying the position:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ rotctl -m 2 -r localhost:4533 \\get_pos
+.RB $ " rotctl -m 2 -r localhost:4533 \\get_pos"
.EE
-.RE
+.in
.
.
.SH BUGS
@@ -799,7 +803,7 @@ Copyright \(co 2001-2011 Stephane Fillod
.br
Copyright \(co 2002-2017 the Hamlib Group (various contributors)
.br
-Copyright \(co 2003-2019 Nate Bargmann
+Copyright \(co 2003-2020 Nate Bargmann
.
.PP
This is free software; see the file COPYING for copying conditions. There is
@@ -817,8 +821,8 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH COLOPHON
.
Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
-archives:
-.IP
+archives are available via
+.
.UR http://www.hamlib.org
hamlib.org
.UE .
diff --git a/doc/man1/rotctld.1 b/doc/man1/rotctld.1
index 528908af..c3bb64a2 100644
--- a/doc/man1/rotctld.1
+++ b/doc/man1/rotctld.1
@@ -5,7 +5,7 @@
.\"
.\" Note: Please keep this page in sync with the source, rotctld.c
.\"
-.TH ROTCTLD "1" "2019-12-10" "Hamlib" "Hamlib Utilities"
+.TH ROTCTLD "1" "2020-09-09" "Hamlib" "Hamlib Utilities"
.
.
.SH NAME
@@ -293,14 +293,15 @@ and
.RI \(aq Elevation \(aq
are floating point values.
.IP
-For example:
+For example (typed text shown in bold):
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-P 163.0 41.0
+.B P 163.0 41.0
.EE
-.RE
+.in
+.
.IP
.BR Note :
If the rotator does not support setting elevation (most do not) supply
@@ -408,21 +409,22 @@ value between 2 and 12.
.IP
For example:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-L -170.0 -85.0 12
+.B L -170.0 -85.0 12
.EE
-.RE
+.in
+.
.IP
returns:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
Locator: AA55AA00AA00
.EE
-.RE
+.in
.
.TP
.BR l ", " loc2lonlat " \(aq" \fILocator\fP \(aq
@@ -442,21 +444,23 @@ expressed as a negative value.
.IP
For example:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
-l AA55AA00AA00
+.B l AA55AA00AA00
.EE
-.RE
+.in
+.
.IP
returns:
.
-.sp
-.RS 1.0i
+.IP
+.in +4n
.EX
Longitude: -169.999983 Latitude: -84.999991
.EE
-.RE
+.in
+.
.IP
.BR Note :
Despite the use of double precision variables internally, some rounding error
@@ -594,22 +598,22 @@ command string with a newline character, \(oq\\n\(cq.
.PP
Example set position (Perl code):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "P 135 10\\n";
+\fBprint $socket "P 135 10\\n";\fP
.EE
-.RE
+.in
.
.PP
or:
.
-.sp
-.RS 0.5i
-.EE
-print $socket "\\\\set_pos 135 10\\n"; # escape leading \(oq\\\(cq
+.PP
+.in +4n
+.EX
+\fBprint $socket "\\\\set_pos 135 10\\n";\fP # escape leading \(oq\\\(cq
.EE
-.RE
+.in
.
.PP
A one line response will be sent as a reply to
@@ -632,16 +636,14 @@ is the Hamlib error code.
.PP
Example get position (Perl code):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-print $socket "p\\n";
-.br
+\fBprint $socket "p\\n";\fP
"135"
-.br
"10"
.EE
-.RE
+.IN
.
.PP
Most
@@ -703,16 +705,14 @@ An example response to a
.B P
command sent from the shell prompt (note the prepended \(oq+\(cq):
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
-$ echo "+P 90 45" | nc -w 1 localhost 4533
-.br
+$ \fBecho "+P 90 45" | nc -w 1 localhost 4533\fP
set_pos: 90 45
-.br
RPRT 0
.EE
-.RE
+.in
.
.PP
In this case the long command name and values are returned on the first line
@@ -724,20 +724,17 @@ An example response to a
.B get_pos
query:
.
-.sp
-.RS 0.5i
+.PP
+.in +3n
.EX
-$ echo "+\\get_pos" | nc -w 1 localhost 4533
-.br
+$ \fBecho "+\\get_pos" | nc -w 1 localhost 4533\fP
get_pos:
-.br
Azimuth: 90.000000
-.br
Elevation: 45.000000
-.br
RPRT 0
.EE
-.RE
+.in
+.
.IP
.BR Note :
The \(oq\\\(cq is still required for the long command name even with the ERP
@@ -796,34 +793,34 @@ For example, invoking a
.B get_pos
query with a leading \(oq;\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_pos:;Azimuth: 90.000000;Elevation: 45.000000;RPRT 0
.EE
-.RE
+.in
.
.PP
Or, using the pipe character \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
get_pos:|Azimuth: 90.000000|Elevation: 45.000000|RPRT 0
.EE
-.RE
+.in
.
.PP
And a
.B set_pos
command prepended with a \(oq|\(cq returns:
.
-.sp
-.RS 0.5i
+.PP
+.in +4n
.EX
set_pos: 135 22.5|RPRT 0
.EE
-.RE
+.in
.
.PP
Such a format will allow reading a response as a single event using a preferred
@@ -863,31 +860,31 @@ sent to and received from the radio which is very useful for radio backend
library development and may be requested by the developers.
.
.
-.SH EXAMPLE
+.SH EXAMPLES
.
Start
.B rotctld
for a Hy-Gain Ham IV rotor with the Idiom Press RotorEZ board installed using
a USB-to-serial ada...
[truncated message content] |
|
From: Nate B. <n0...@us...> - 2020-09-08 14:16:54
|
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, Hamlib-4.0 has been updated
via 03bc9386288dad95cb917eab8bae66ef751df9fc (commit)
from b7452d766271b763fde8be3d0ba892c23a966cb1 (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 03bc9386288dad95cb917eab8bae66ef751df9fc
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 16:35:13 2020 -0500
Fix ft857 RFPOWER
https://github.com/Hamlib/Hamlib/issues/368
(cherry picked from commit ce18ec7bf55941cc80abcacb0867e68a20772254)
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 3f71100d..836ddb2c 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -155,7 +155,7 @@ const struct rig_caps ft857_caps =
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
- .version = "20200628.0",
+ .version = "20200907.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -796,11 +796,11 @@ static int ft857_get_pometer_level(RIG *rig, value_t *val)
{
rig_debug(RIG_DEBUG_TRACE, "%s: bars=%d\n", __func__, p->tx_status & 0x0F);
// does rig have 10 bars or 15?
- val->i = (p->tx_status & 0x0F) / 10.0;
+ val->f = (p->tx_status & 0x0F) / 10.0;
}
else
{
- val->i = 0; // invalid value return
+ val->f = 0; // invalid value return
}
return RIG_OK;
-----------------------------------------------------------------------
Summary of changes:
rigs/yaesu/ft857.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-07 22:47:03
|
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 ce18ec7bf55941cc80abcacb0867e68a20772254 (commit)
via 741499c2609ee67982e8d3afbcb62e9e41f3ceec (commit)
from 6d74501d2cd5547db5c3bfbbd70317a75a284706 (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 ce18ec7bf55941cc80abcacb0867e68a20772254
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 16:35:13 2020 -0500
Fix ft857 RFPOWER
https://github.com/Hamlib/Hamlib/issues/368
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 3f71100d..836ddb2c 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -155,7 +155,7 @@ const struct rig_caps ft857_caps =
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
- .version = "20200628.0",
+ .version = "20200907.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -796,11 +796,11 @@ static int ft857_get_pometer_level(RIG *rig, value_t *val)
{
rig_debug(RIG_DEBUG_TRACE, "%s: bars=%d\n", __func__, p->tx_status & 0x0F);
// does rig have 10 bars or 15?
- val->i = (p->tx_status & 0x0F) / 10.0;
+ val->f = (p->tx_status & 0x0F) / 10.0;
}
else
{
- val->i = 0; // invalid value return
+ val->f = 0; // invalid value return
}
return RIG_OK;
commit 741499c2609ee67982e8d3afbcb62e9e41f3ceec
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 09:59:32 2020 -0500
Add amplifier.swg to Makefile.am
https://github.com/Hamlib/Hamlib/issues/367
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index a3b590f6..b01407a8 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -9,13 +9,15 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/bindings $(PYTHON_CPPFLAGS) \
AM_CFLAGS = -fno-strict-aliasing
AM_CXXFLAGS = -O2
-SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg
+SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg amplifier.swg
SWGDEP = \
$(top_srcdir)/include/hamlib/rig.h \
$(top_srcdir)/include/hamlib/riglist.h \
$(top_srcdir)/include/hamlib/rotator.h \
$(top_srcdir)/include/hamlib/rotlist.h \
+ $(top_srcdir)/include/hamlib/amplifier.h \
+ $(top_srcdir)/include/hamlib/amplist.h \
$(SWGFILES)
EXTRA_DIST = $(SWGFILES) \
-----------------------------------------------------------------------
Summary of changes:
bindings/Makefile.am | 4 +++-
rigs/yaesu/ft857.c | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-07 17:39:09
|
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, Hamlib-4.0 has been updated
via b7452d766271b763fde8be3d0ba892c23a966cb1 (commit)
from d4c36463f173f3db4d42ecafa8af2f7b1ebe9f19 (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 b7452d766271b763fde8be3d0ba892c23a966cb1
Author: Nate Bargmann <n0...@n0...>
Date: Mon Sep 7 12:34:04 2020 -0500
Advance to rc2
Include new rig IC-705, various fixes, and include amplifier.swg to
bindings/Makefile.am
diff --git a/configure.ac b/configure.ac
index 21f860fa..eabd6a7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl however, the use of '~' should be fine as apt (others?) will treat
dnl it as an earlier version than the actual release. TNX KA6MAL
dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
AC_INIT([Hamlib],
- [4.0~rc1],
+ [4.0~rc2],
[ham...@li...],
[hamlib],
[http://www.hamlib.org])
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-07 17:14:17
|
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, Hamlib-4.0 has been updated
via d4c36463f173f3db4d42ecafa8af2f7b1ebe9f19 (commit)
via 8c6596ad7fde163fc4d358378d7478b5426bcde2 (commit)
via ead1ae6f2e509cf3ff3917a71be9e3ca0c0ce9ab (commit)
via b3cc98c59da69dcbcf802dad0cd3b8785bcceb87 (commit)
via f87b43897077e9edff9d5331d4cab29523a61c07 (commit)
via ce2e20edd8ad77ac286bbf868982b885ba0b783e (commit)
via e7454b7bf30f5b53c25bfb1bc6ce4bc4d51cb9d6 (commit)
via d1ffd9b434bd7e80f9f18562a85509a4feb3ed04 (commit)
via e79ad26b14ad02b64f0d20128711bc76de438d92 (commit)
from cee9c9e75521d24db0e0efb540b05deb32131538 (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 d4c36463f173f3db4d42ecafa8af2f7b1ebe9f19
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 09:59:32 2020 -0500
Add amplifier.swg to Makefile.am
https://github.com/Hamlib/Hamlib/issues/367
(cherry picked from commit 741499c2609ee67982e8d3afbcb62e9e41f3ceec)
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index a3b590f6..b01407a8 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -9,13 +9,15 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/bindings $(PYTHON_CPPFLAGS) \
AM_CFLAGS = -fno-strict-aliasing
AM_CXXFLAGS = -O2
-SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg
+SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg amplifier.swg
SWGDEP = \
$(top_srcdir)/include/hamlib/rig.h \
$(top_srcdir)/include/hamlib/riglist.h \
$(top_srcdir)/include/hamlib/rotator.h \
$(top_srcdir)/include/hamlib/rotlist.h \
+ $(top_srcdir)/include/hamlib/amplifier.h \
+ $(top_srcdir)/include/hamlib/amplist.h \
$(SWGFILES)
EXTRA_DIST = $(SWGFILES) \
commit 8c6596ad7fde163fc4d358378d7478b5426bcde2
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 09:22:28 2020 -0500
Fix ic7300 ranges
(cherry picked from commit 6d74501d2cd5547db5c3bfbbd70317a75a284706)
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 71b36604..26df43b9 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -325,22 +325,17 @@ const struct rig_caps ic7300_caps =
},
.rx_range_list1 = {
- {kHz(30), MHz(199.999999), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
- {MHz(400), MHz(470), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
},
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_2m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_70cm(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_2m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_70cm(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(50), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(12.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},
commit ead1ae6f2e509cf3ff3917a71be9e3ca0c0ce9ab
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 08:53:39 2020 -0500
Remove sleep on rigctld EOF -- don't think it's really needed
https://github.com/Hamlib/Hamlib/issues/366
(cherry picked from commit 275db971cd2d231f555c943bf0310a1e99dd5292)
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 2b0baea7..7d312944 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -1049,7 +1049,7 @@ void *handle_socket(void *arg)
if (retcode == -1)
{
- sleep(1);
+ //sleep(1); // probably don't need this delay
continue;
}
commit b3cc98c59da69dcbcf802dad0cd3b8785bcceb87
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 08:17:20 2020 -0500
Fix range_list for ic7300
(cherry picked from commit b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e)
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 0707b948..71b36604 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -325,16 +325,16 @@ const struct rig_caps ic7300_caps =
},
.rx_range_list1 = {
- {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
- {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ {kHz(30), MHz(199.999999), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
+ {MHz(400), MHz(470), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
},
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_2m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_70cm(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_2m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_70cm(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
commit f87b43897077e9edff9d5331d4cab29523a61c07
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 23:52:48 2020 -0500
Fix 32-bit overflow on rigctl reading rigctld caps values like get_level and set_level
https://github.com/Hamlib/Hamlib/issues/365
(cherry picked from commit 9d542cab81f71736a7ef5a38380d8b43d2426a51)
diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c
index 5ce28495..3507e364 100644
--- a/dummy/netrigctl.c
+++ b/dummy/netrigctl.c
@@ -432,7 +432,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_func = strtol(buf, NULL, 0);
+ rs->has_get_func = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -441,7 +441,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_func = strtol(buf, NULL, 0);
+ rs->has_set_func = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -450,7 +450,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_level = strtol(buf, NULL, 0);
+ rs->has_get_level = strtoll(buf, NULL, 0);
if (rs->has_get_level & RIG_LEVEL_RAWSTR)
{
@@ -467,7 +467,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_level = strtol(buf, NULL, 0);
+ rs->has_set_level = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -476,7 +476,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_parm = strtol(buf, NULL, 0);
+ rs->has_get_parm = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -485,7 +485,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_parm = strtol(buf, NULL, 0);
+ rs->has_set_parm = strtoll(buf, NULL, 0);
#if 0
gran_t level_gran[RIG_SETTING_MAX]; /*!< level granularity */
@@ -526,7 +526,7 @@ static int netrigctl_open(RIG *rig)
{
if (strcmp(setting, "vfo_ops") == 0)
{
- rig->caps->vfo_ops = strtol(value, NULL, 0);
+ rig->caps->vfo_ops = strtoll(value, NULL, 0);
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting,
rig->caps->vfo_ops);
}
commit ce2e20edd8ad77ac286bbf868982b885ba0b783e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 16:45:52 2020 -0500
Fix stack smash in sprintflst when long lists occur
Need to pass length into these functions
(cherry picked from commit 1b6d67a2789af596396ad7541793f1830d9b6684)
diff --git a/tests/sprintflst.h b/tests/sprintflst.h
index db4e6165..715e4a06 100644
--- a/tests/sprintflst.h
+++ b/tests/sprintflst.h
@@ -24,7 +24,7 @@
#include <hamlib/rig.h>
-#define SPRINTF_MAX_SIZE 256
+#define SPRINTF_MAX_SIZE 512
__BEGIN_DECLS
commit e7454b7bf30f5b53c25bfb1bc6ce4bc4d51cb9d6
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 15:03:40 2020 -0500
Fix spelling error in cppcheck.sh
(cherry picked from commit 8e3d024144cb16be55df0397f806598d9542e69f)
diff --git a/cppcheck.sh b/cppcheck.sh
index 2021a740..d5dfb598 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -3,7 +3,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...especially in the C++ area
-echo "Idealy there should be no errors or warnings"
+echo "Ideally there should be no errors or warnings"
# We do suppress some errors which are expected or other code
# There are quite a few C++ items to take care of still if anybody cares
commit d1ffd9b434bd7e80f9f18562a85509a4feb3ed04
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 12:41:43 2020 -0500
Small update to cppcheck.sh
(cherry picked from commit f33a5611bc685d926d8616f6051fcb82d4d0da96)
diff --git a/cppcheck.sh b/cppcheck.sh
index ef58eb4e..2021a740 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -3,9 +3,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...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"
+echo "Idealy there should be no errors or warnings"
# We do suppress some errors which are expected or other code
# There are quite a few C++ items to take care of still if anybody cares
@@ -78,6 +76,8 @@ CHECK="\
# If no directory or file name provided, scan the entire project.
if test $# -eq 0 ; then
+ echo "See cppcheck.log when done"
+ echo "This takes a while to run"
cppcheck --inline-suppr \
-I src \
-I include \
commit e79ad26b14ad02b64f0d20128711bc76de438d92
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 12:28:35 2020 -0500
Added IC-705
Added RIG_LEVEL_BRIGHT -- IC705 has this level
Fixed range printout
https://github.com/Hamlib/Hamlib/issues/364
(cherry picked from commit 24fb47cbe019c9e5af631479a9237bfa9bb5e670)
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index b382f9d1..57f9c32f 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -880,7 +880,7 @@ enum rig_level_e {
RIG_LEVEL_NOTCHF_RAW = CONSTANT_64BIT_FLAG(36), /*!< \c NOTCHF_RAW -- Notch Freq., arg float [0.0 ... 1.0] */
RIG_LEVEL_MONITOR_GAIN = CONSTANT_64BIT_FLAG(37), /*!< \c MONITOR_GAIN -- Monitor gain (level for monitoring of transmitted audio), arg float [0.0 ... 1.0] */
RIG_LEVEL_NB = CONSTANT_64BIT_FLAG(38), /*!< \c NB -- Noise Blanker level, arg float [0.0 ... 1.0] */
- RIG_LEVEL_39 = CONSTANT_64BIT_FLAG(39), /*!< \c Future use */
+ RIG_LEVEL_BRIGHT = CONSTANT_64BIT_FLAG(39), /*!< \c Display brightness */
RIG_LEVEL_40 = CONSTANT_64BIT_FLAG(40), /*!< \c Future use */
RIG_LEVEL_41 = CONSTANT_64BIT_FLAG(41), /*!< \c Future use */
RIG_LEVEL_42 = CONSTANT_64BIT_FLAG(42), /*!< \c Future use */
diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index 6f1e8327..186ad5bc 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -256,7 +256,8 @@
#define RIG_MODEL_ID4100 RIG_MAKE_MODEL(RIG_ICOM, 82)
#define RIG_MODEL_ID31 RIG_MAKE_MODEL(RIG_ICOM, 83)
#define RIG_MODEL_ID51 RIG_MAKE_MODEL(RIG_ICOM, 84)
-/* next one is 85 */
+#define RIG_MODEL_IC705 RIG_MAKE_MODEL(RIG_ICOM, 85)
+/* next one is 86 */
/*
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 898e50e4..0707b948 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -66,6 +66,14 @@ struct cmdparams ic7300_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
+struct cmdparams ic705_extcmds[] =
+{
+ { {.s = RIG_PARM_BEEP}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x29}, CMD_DAT_BOL, 1 },
+ { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x03, 0x59}, CMD_DAT_INT, 1 },
+ { {.s = RIG_PARM_SCREENSAVER}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x38}, CMD_DAT_INT, 1 },
+ { {.s = RIG_PARM_NONE} }
+};
+
/*
* IC-7300 S-meter levels measured from live signals on multiple bands. Provides a good approximation.
*/
@@ -125,6 +133,14 @@ struct cmdparams ic7300_extcmds[] =
} }
+/*
+ * IC705 items that differ from IC7300
+ */
+#define IC705_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
+#define IC705_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM|RIG_MODE_DSTAR)
+#define IC705_OTHER_TX_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
+#define IC705_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_BRIGHT)
+
/*
* IC9700 items that differ from IC7300
*/
@@ -134,8 +150,8 @@ struct cmdparams ic7300_extcmds[] =
#define IC9700_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB)
#define IC9700_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL)
#define IC9700_SCAN_OPS (RIG_SCAN_STOP|RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_SLCT)
-#define IC9700_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD|RIG_MODE_DSTAR)
-#define IC9700_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD|RIG_MODE_DSTAR)
+#define IC9700_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD)
+#define IC9700_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD)
struct cmdparams ic9700_extcmds[] =
{
@@ -236,6 +252,23 @@ static const struct icom_priv_caps IC9700_priv_caps =
.extcmds = ic9700_extcmds, /* Custom op parameters */
};
+static const struct icom_priv_caps IC705_priv_caps =
+{
+ 0xA4, /* default address */
+ 0, /* 731 mode */
+ 1, /* no XCHG to avoid display flickering */
+ ic705_ts_sc_list,
+ .serial_USB_echo_check = 1, /* USB CI-V may not echo */
+ .agc_levels_present = 1,
+ .agc_levels = {
+ { .level = RIG_AGC_FAST, .icom_level = 1 },
+ { .level = RIG_AGC_MEDIUM, .icom_level = 2 },
+ { .level = RIG_AGC_SLOW, .icom_level = 3 },
+ { .level = -1, .icom_level = 0 },
+ },
+ .extcmds = ic705_extcmds, /* Custom op parameters */
+};
+
const struct rig_caps ic7300_caps =
{
RIG_MODEL(RIG_MODEL_IC7300),
@@ -288,31 +321,26 @@ const struct rig_caps ic7300_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
- { 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},
- .rx_range_list1 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
+ .rx_range_list1 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ },
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(12.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- RIG_FRNG_END,
- },
-
- .rx_range_list2 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
- .tx_range_list2 = {
- FRQ_RNG_HF(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_HF(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_2m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_70cm(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_2m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_70cm(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},
@@ -662,3 +690,207 @@ const struct rig_caps ic9700_caps =
.send_morse = icom_send_morse,
.send_voice_mem = icom_send_voice_mem
};
+
+const struct rig_caps ic705_caps =
+{
+ RIG_MODEL(RIG_MODEL_IC705),
+ .model_name = "IC-705",
+ .mfg_name = "Icom",
+ .version = BACKEND_VER ".0",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_ALPHA,
+ .rig_type = RIG_TYPE_TRANSCEIVER,
+ .ptt_type = RIG_PTT_RIG,
+ .dcd_type = RIG_DCD_RIG,
+ .port_type = RIG_PORT_SERIAL,
+ .serial_rate_min = 4800,
+ .serial_rate_max = 19200,
+ .serial_data_bits = 8,
+ .serial_stop_bits = 1,
+ .serial_parity = RIG_PARITY_NONE,
+ .serial_handshake = RIG_HANDSHAKE_NONE,
+ .write_delay = 0,
+ .post_write_delay = 0,
+ .timeout = 1000,
+ .retry = 3,
+ .has_get_func = IC7300_FUNCS,
+ .has_set_func = IC7300_FUNCS,
+ .has_get_level = IC705_LEVELS,
+ .has_set_level = RIG_LEVEL_SET(IC705_LEVELS),
+ .has_get_parm = IC7300_PARMS,
+ .has_set_parm = RIG_PARM_SET(IC7300_PARMS),
+ .level_gran = {
+ [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
+ [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
+ [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
+ [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
+ },
+ .parm_gran = {},
+ .extlevels = NULL,
+ .ctcss_list = full_ctcss_list,
+ .dcs_list = NULL,
+ .preamp = { 1, 2, RIG_DBLST_END, },
+ .attenuator = { 20, RIG_DBLST_END, },
+ .max_rit = Hz(9999),
+ .max_xit = Hz(9999),
+ .max_ifshift = Hz(0),
+ .targetable_vfo = 0,
+ .vfo_ops = IC7300_VFO_OPS,
+ .scan_ops = IC7300_SCAN_OPS,
+ .transceive = RIG_TRN_RIG,
+ .bank_qty = 5,
+ .chan_desc_sz = 0,
+
+ .chan_list = {
+ { 1, 99, RIG_MTYPE_MEM },
+ RIG_CHAN_END,
+ },
+
+ .rx_range_list1 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "USA"},
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "USA"},
+ RIG_FRNG_END,
+ },
+ .tx_range_list1 = {
+ { kHz(1800), MHz(1.999999),IC705_ALL_TX_MODES, W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(3.5), MHz(3.999999),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(5.255), MHz(5.405),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(7.0), MHz(7.3),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(10.1), MHz(10.15),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(14.0), MHz(14.35),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(18.068), MHz(18.168),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(21.00), MHz(21.45),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(24.89), MHz(24.99),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(28.00), MHz(29.70),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(50.00), MHz(54.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(144.00), MHz(148.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(430.00), MHz(450.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ RIG_FRNG_END,
+ },
+
+ .rx_range_list2 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "EUR"},
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "EUR"},
+ RIG_FRNG_END,
+ },
+ .tx_range_list2 = {
+ { kHz(1810), MHz(1.999999),IC705_ALL_TX_MODES, W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(3.5), MHz(3.8),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(7.0), MHz(7.2),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(10.1), MHz(10.15),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(14.0), MHz(14.35),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(18.068), MHz(18.168),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(21.00), MHz(21.45),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(24.89), MHz(24.99),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(28.00), MHz(29.70),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(50.00), MHz(52.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(144.00), MHz(146.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(430.00), MHz(440.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ RIG_FRNG_END,
+ },
+
+ .tuning_steps = {
+ {IC7300_ALL_RX_MODES, Hz(100)},
+ {IC7300_ALL_RX_MODES, kHz(.5)},
+ {IC7300_ALL_RX_MODES, kHz(1)},
+ {IC7300_ALL_RX_MODES, kHz(5)},
+ {IC7300_ALL_RX_MODES, kHz(6.25)},
+ {IC7300_ALL_RX_MODES, kHz(8.33)},
+ {IC7300_ALL_RX_MODES, kHz(9)},
+ {IC7300_ALL_RX_MODES, kHz(10)},
+ {IC7300_ALL_RX_MODES, kHz(12.5)},
+ {IC7300_ALL_RX_MODES, kHz(20)},
+ {IC7300_ALL_RX_MODES, kHz(25)},
+ {IC7300_ALL_RX_MODES, kHz(50)},
+ {IC7300_ALL_RX_MODES, kHz(100)},
+ RIG_TS_END,
+ },
+
+ /* mode/filter list, remember: order matters! But duplication may speed up search. Put the most commonly used modes first! Remember these are defaults, with dsp rigs you can change them to anything you want except FM and WFM which are fixed */
+ .filters = {
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(3.6)},
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(2.4)},
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(1.8)},
+ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(500)},
+ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(250)},
+ {RIG_MODE_CW | RIG_MODE_CWR, kHz(1.2)},
+ {RIG_MODE_RTTY | RIG_MODE_RTTYR, kHz(2.4)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(6)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(3)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(9)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(10)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(7)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(15)},
+ RIG_FLT_END,
+ },
+
+ .str_cal = IC7300_STR_CAL,
+ .swr_cal = IC7300_SWR_CAL,
+ .alc_cal = IC7300_ALC_CAL,
+ .rfpower_meter_cal = IC7300_RFPOWER_METER_CAL,
+ .comp_meter_cal = IC7300_COMP_METER_CAL,
+ .vd_meter_cal = IC7300_VD_METER_CAL,
+ .id_meter_cal = IC7300_ID_METER_CAL,
+
+ .cfgparams = icom_cfg_params,
+ .set_conf = icom_set_conf,
+ .get_conf = icom_get_conf,
+
+ .priv = (void *)& IC705_priv_caps,
+ .rig_init = icom_init,
+ .rig_cleanup = icom_cleanup,
+ .rig_open = icom_rig_open,
+ .rig_close = icom_rig_close,
+
+ .set_freq = icom_set_freq,
+ .get_freq = icom_get_freq,
+ .set_mode = icom_set_mode_with_data,
+ .get_mode = icom_get_mode_with_data,
+//.get_vfo = icom_get_vfo,
+ .set_vfo = icom_set_vfo,
+ .set_ant = NULL,
+ .get_ant = NULL,
+
+ .set_rit = icom_set_rit_new,
+ .get_rit = icom_get_rit_new,
+ .get_xit = icom_get_rit_new,
+ .set_xit = icom_set_xit_new,
+
+ .decode_event = icom_decode_event,
+ .set_level = icom_set_level,
+ .get_level = icom_get_level,
+ .set_ext_level = icom_set_ext_level,
+ .get_ext_level = icom_get_ext_level,
+ .set_func = icom_set_func,
+ .get_func = icom_get_func,
+ .set_parm = icom_set_parm,
+ .get_parm = icom_get_parm,
+ .set_mem = icom_set_mem,
+ .vfo_op = icom_vfo_op,
+ .scan = icom_scan,
+ .set_ptt = icom_set_ptt,
+ .get_ptt = icom_get_ptt,
+ .get_dcd = icom_get_dcd,
+ .set_ts = icom_set_ts,
+ .get_ts = icom_get_ts,
+ .set_rptr_shift = icom_set_rptr_shift,
+ .get_rptr_shift = icom_get_rptr_shift,
+ .set_rptr_offs = icom_set_rptr_offs,
+ .get_rptr_offs = icom_get_rptr_offs,
+ .set_ctcss_tone = icom_set_ctcss_tone,
+ .get_ctcss_tone = icom_get_ctcss_tone,
+ .set_ctcss_sql = icom_set_ctcss_sql,
+ .get_ctcss_sql = icom_get_ctcss_sql,
+ .set_split_freq = icom_set_split_freq,
+ .get_split_freq = icom_get_split_freq,
+ .set_split_mode = icom_set_split_mode,
+ .get_split_mode = icom_get_split_mode,
+ .set_split_vfo = icom_set_split_vfo,
+ .get_split_vfo = icom_get_split_vfo,
+ .set_powerstat = icom_set_powerstat,
+ .get_powerstat = icom_get_powerstat,
+ .power2mW = icom_power2mW,
+ .mW2power = icom_mW2power,
+ .send_morse = icom_send_morse,
+ .send_voice_mem = icom_send_voice_mem
+};
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 446e3924..24a6cd32 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -353,6 +353,26 @@ const struct ts_sc_list r8600_ts_sc_list[] =
{0, 0},
};
+const struct ts_sc_list ic705_ts_sc_list[] =
+{
+ {10, 0x00},
+ {100, 0x01},
+ {500, 0x02},
+ {kHz(1), 0x03},
+ {kHz(5), 0x04},
+ {kHz(6.25), 0x05},
+ {kHz(8.33), 0x06},
+ {kHz(9), 0x07},
+ {kHz(10), 0x08},
+ {kHz(12.5), 0x09},
+ {kHz(20), 0x10},
+ {kHz(25), 0x11},
+ {kHz(50), 0x12},
+ {kHz(100), 0x13},
+ {0, 0x13}, /* programmable tuning step not supported */
+ {0, 0},
+};
+
/* rtty filter list for some DSP rigs ie PRO */
@@ -2633,6 +2653,11 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
lvl_sc = S_LVL_MON;
break;
+ case RIG_LEVEL_BRIGHT:
+ lvl_cn = C_CTL_LVL;
+ lvl_sc = S_LVL_BRIGHT;
+ break;
+
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__,
rig_strlevel(level));
@@ -7409,6 +7434,7 @@ DECLARE_INITRIG_BACKEND(icom)
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&ic703_caps);
+ rig_register(&ic705_caps);
rig_register(&ic706_caps);
rig_register(&ic706mkii_caps);
rig_register(&ic706mkiig_caps);
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 47a12f86..b5959882 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20200720"
+#define BACKEND_VER "20200906"
/*
* defines used by comp_cal_str in rig.c
@@ -202,6 +202,7 @@ extern const struct ts_sc_list r9000_ts_sc_list[];
extern const struct ts_sc_list r9500_ts_sc_list[];
extern const struct ts_sc_list ic756_ts_sc_list[];
extern const struct ts_sc_list ic756pro_ts_sc_list[];
+extern const struct ts_sc_list ic705_ts_sc_list[];
extern const struct ts_sc_list ic706_ts_sc_list[];
extern const struct ts_sc_list ic7000_ts_sc_list[];
extern const struct ts_sc_list ic7100_ts_sc_list[];
@@ -322,6 +323,7 @@ extern const struct confparams icom_ext_parms[];
extern const struct cmdparams icom_ext_cmds[];
extern const struct rig_caps ic703_caps;
+extern const struct rig_caps ic705_caps;
extern const struct rig_caps ic706_caps;
extern const struct rig_caps ic706mkii_caps;
extern const struct rig_caps ic706mkiig_caps;
diff --git a/src/idx_builtin.h b/src/idx_builtin.h
index e95a0b5c..d52b2779 100644
--- a/src/idx_builtin.h
+++ b/src/idx_builtin.h
@@ -150,7 +150,8 @@
#define LVL_NB setting2idx_builtin(RIG_LEVEL_NB)
-#define LVL_39 setting2idx_builtin(RIG_LEVEL_41)
+#define LVL_BRIGHT setting2idx_builtin(RIG_LEVEL_BRIGHT)
+
#define LVL_40 setting2idx_builtin(RIG_LEVEL_40)
#define LVL_41 setting2idx_builtin(RIG_LEVEL_41)
#define LVL_42 setting2idx_builtin(RIG_LEVEL_42)
diff --git a/src/misc.c b/src/misc.c
index a8c81175..56c3656a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -683,6 +683,7 @@ static struct
{ RIG_LEVEL_NOTCHF_RAW, "NOTCHF_RAW" },
{ RIG_LEVEL_MONITOR_GAIN, "MONITOR_GAIN" },
{ RIG_LEVEL_NB, "NB" },
+ { RIG_LEVEL_BRIGHT, "BRIGHT" },
{ RIG_LEVEL_NONE, "" },
};
diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c
index abe597af..b0a5ca36 100644
--- a/tests/dumpcaps.c
+++ b/tests/dumpcaps.c
@@ -486,7 +486,7 @@ int dumpcaps(RIG *rig, FILE *fout)
status = range_sanity_check(caps->tx_range_list1, 0);
fprintf(fout,
- "TX ranges #1 status for:%s \t%s (%d)\n", label1,
+ "TX ranges #1 status for %s:\t%s (%d)\n", label1,
status ? "Bad" : "OK",
status);
diff --git a/tests/dumpmem.c b/tests/dumpmem.c
index 9f965b53..97cf6edc 100644
--- a/tests/dumpmem.c
+++ b/tests/dumpmem.c
@@ -397,5 +397,10 @@ int dump_chan(RIG *rig, int chan_num)
printf("BKINDL: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BKINDL)].i);
}
+ if (rig_has_set_level(rig, RIG_LEVEL_BRIGHT))
+ {
+ printf("BRIGHT: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BRIGHT)].i);
+ }
+
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
bindings/Makefile.am | 4 +-
cppcheck.sh | 6 +-
dummy/netrigctl.c | 14 +--
include/hamlib/rig.h | 2 +-
include/hamlib/riglist.h | 3 +-
rigs/icom/ic7300.c | 259 ++++++++++++++++++++++++++++++++++++++++++++---
rigs/icom/icom.c | 26 +++++
rigs/icom/icom.h | 4 +-
src/idx_builtin.h | 3 +-
src/misc.c | 1 +
tests/dumpcaps.c | 2 +-
tests/dumpmem.c | 5 +
tests/rigctld.c | 2 +-
tests/sprintflst.h | 2 +-
14 files changed, 299 insertions(+), 34 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-07 14:24:18
|
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 6d74501d2cd5547db5c3bfbbd70317a75a284706 (commit)
from 275db971cd2d231f555c943bf0310a1e99dd5292 (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 6d74501d2cd5547db5c3bfbbd70317a75a284706
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 09:22:28 2020 -0500
Fix ic7300 ranges
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 71b36604..26df43b9 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -325,22 +325,17 @@ const struct rig_caps ic7300_caps =
},
.rx_range_list1 = {
- {kHz(30), MHz(199.999999), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
- {MHz(400), MHz(470), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
},
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_2m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_70cm(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_2m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_70cm(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(50), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(12.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},
-----------------------------------------------------------------------
Summary of changes:
rigs/icom/ic7300.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-07 13:56:23
|
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 275db971cd2d231f555c943bf0310a1e99dd5292 (commit)
from b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e (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 275db971cd2d231f555c943bf0310a1e99dd5292
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 08:53:39 2020 -0500
Remove sleep on rigctld EOF -- don't think it's really needed
https://github.com/Hamlib/Hamlib/issues/366
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 2b0baea7..7d312944 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -1049,7 +1049,7 @@ void *handle_socket(void *arg)
if (retcode == -1)
{
- sleep(1);
+ //sleep(1); // probably don't need this delay
continue;
}
-----------------------------------------------------------------------
Summary of changes:
tests/rigctld.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-07 13:18:26
|
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 b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e (commit)
via 9d542cab81f71736a7ef5a38380d8b43d2426a51 (commit)
from 1b6d67a2789af596396ad7541793f1830d9b6684 (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 b7c3aa3ad19fe6cd7cc53738a43f56b853806a1e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Sep 7 08:17:20 2020 -0500
Fix range_list for ic7300
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 0707b948..71b36604 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -325,16 +325,16 @@ const struct rig_caps ic7300_caps =
},
.rx_range_list1 = {
- {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
- {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ {kHz(30), MHz(199.999999), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
+ {MHz(400), MHz(470), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
},
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_2m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_70cm(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_2m(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_70cm(1, IC7300_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
commit 9d542cab81f71736a7ef5a38380d8b43d2426a51
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 23:52:48 2020 -0500
Fix 32-bit overflow on rigctl reading rigctld caps values like get_level and set_level
https://github.com/Hamlib/Hamlib/issues/365
diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c
index 5ce28495..3507e364 100644
--- a/dummy/netrigctl.c
+++ b/dummy/netrigctl.c
@@ -432,7 +432,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_func = strtol(buf, NULL, 0);
+ rs->has_get_func = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -441,7 +441,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_func = strtol(buf, NULL, 0);
+ rs->has_set_func = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -450,7 +450,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_level = strtol(buf, NULL, 0);
+ rs->has_get_level = strtoll(buf, NULL, 0);
if (rs->has_get_level & RIG_LEVEL_RAWSTR)
{
@@ -467,7 +467,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_level = strtol(buf, NULL, 0);
+ rs->has_set_level = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -476,7 +476,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_get_parm = strtol(buf, NULL, 0);
+ rs->has_get_parm = strtoll(buf, NULL, 0);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
@@ -485,7 +485,7 @@ static int netrigctl_open(RIG *rig)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- rs->has_set_parm = strtol(buf, NULL, 0);
+ rs->has_set_parm = strtoll(buf, NULL, 0);
#if 0
gran_t level_gran[RIG_SETTING_MAX]; /*!< level granularity */
@@ -526,7 +526,7 @@ static int netrigctl_open(RIG *rig)
{
if (strcmp(setting, "vfo_ops") == 0)
{
- rig->caps->vfo_ops = strtol(value, NULL, 0);
+ rig->caps->vfo_ops = strtoll(value, NULL, 0);
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting,
rig->caps->vfo_ops);
}
-----------------------------------------------------------------------
Summary of changes:
dummy/netrigctl.c | 14 +++++++-------
rigs/icom/ic7300.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-06 21:47:16
|
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 1b6d67a2789af596396ad7541793f1830d9b6684 (commit)
from 8e3d024144cb16be55df0397f806598d9542e69f (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 1b6d67a2789af596396ad7541793f1830d9b6684
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 16:45:52 2020 -0500
Fix stack smash in sprintflst when long lists occur
Need to pass length into these functions
diff --git a/tests/sprintflst.h b/tests/sprintflst.h
index db4e6165..715e4a06 100644
--- a/tests/sprintflst.h
+++ b/tests/sprintflst.h
@@ -24,7 +24,7 @@
#include <hamlib/rig.h>
-#define SPRINTF_MAX_SIZE 256
+#define SPRINTF_MAX_SIZE 512
__BEGIN_DECLS
-----------------------------------------------------------------------
Summary of changes:
tests/sprintflst.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-06 20:04:01
|
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 8e3d024144cb16be55df0397f806598d9542e69f (commit)
from f33a5611bc685d926d8616f6051fcb82d4d0da96 (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 8e3d024144cb16be55df0397f806598d9542e69f
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 15:03:40 2020 -0500
Fix spelling error in cppcheck.sh
diff --git a/cppcheck.sh b/cppcheck.sh
index 2021a740..d5dfb598 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -3,7 +3,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...especially in the C++ area
-echo "Idealy there should be no errors or warnings"
+echo "Ideally there should be no errors or warnings"
# We do suppress some errors which are expected or other code
# There are quite a few C++ items to take care of still if anybody cares
-----------------------------------------------------------------------
Summary of changes:
cppcheck.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-06 17:42:18
|
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 f33a5611bc685d926d8616f6051fcb82d4d0da96 (commit)
via 24fb47cbe019c9e5af631479a9237bfa9bb5e670 (commit)
from 120c6b2ca61a31147203e17be4e2e6d02e2bfcd9 (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 f33a5611bc685d926d8616f6051fcb82d4d0da96
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 12:41:43 2020 -0500
Small update to cppcheck.sh
diff --git a/cppcheck.sh b/cppcheck.sh
index ef58eb4e..2021a740 100755
--- a/cppcheck.sh
+++ b/cppcheck.sh
@@ -3,9 +3,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...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"
+echo "Idealy there should be no errors or warnings"
# We do suppress some errors which are expected or other code
# There are quite a few C++ items to take care of still if anybody cares
@@ -78,6 +76,8 @@ CHECK="\
# If no directory or file name provided, scan the entire project.
if test $# -eq 0 ; then
+ echo "See cppcheck.log when done"
+ echo "This takes a while to run"
cppcheck --inline-suppr \
-I src \
-I include \
commit 24fb47cbe019c9e5af631479a9237bfa9bb5e670
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Sep 6 12:28:35 2020 -0500
Added IC-705
Added RIG_LEVEL_BRIGHT -- IC705 has this level
Fixed range printout
https://github.com/Hamlib/Hamlib/issues/364
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index b382f9d1..57f9c32f 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -880,7 +880,7 @@ enum rig_level_e {
RIG_LEVEL_NOTCHF_RAW = CONSTANT_64BIT_FLAG(36), /*!< \c NOTCHF_RAW -- Notch Freq., arg float [0.0 ... 1.0] */
RIG_LEVEL_MONITOR_GAIN = CONSTANT_64BIT_FLAG(37), /*!< \c MONITOR_GAIN -- Monitor gain (level for monitoring of transmitted audio), arg float [0.0 ... 1.0] */
RIG_LEVEL_NB = CONSTANT_64BIT_FLAG(38), /*!< \c NB -- Noise Blanker level, arg float [0.0 ... 1.0] */
- RIG_LEVEL_39 = CONSTANT_64BIT_FLAG(39), /*!< \c Future use */
+ RIG_LEVEL_BRIGHT = CONSTANT_64BIT_FLAG(39), /*!< \c Display brightness */
RIG_LEVEL_40 = CONSTANT_64BIT_FLAG(40), /*!< \c Future use */
RIG_LEVEL_41 = CONSTANT_64BIT_FLAG(41), /*!< \c Future use */
RIG_LEVEL_42 = CONSTANT_64BIT_FLAG(42), /*!< \c Future use */
diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index 6f1e8327..186ad5bc 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -256,7 +256,8 @@
#define RIG_MODEL_ID4100 RIG_MAKE_MODEL(RIG_ICOM, 82)
#define RIG_MODEL_ID31 RIG_MAKE_MODEL(RIG_ICOM, 83)
#define RIG_MODEL_ID51 RIG_MAKE_MODEL(RIG_ICOM, 84)
-/* next one is 85 */
+#define RIG_MODEL_IC705 RIG_MAKE_MODEL(RIG_ICOM, 85)
+/* next one is 86 */
/*
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 898e50e4..0707b948 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -66,6 +66,14 @@ struct cmdparams ic7300_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
+struct cmdparams ic705_extcmds[] =
+{
+ { {.s = RIG_PARM_BEEP}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x29}, CMD_DAT_BOL, 1 },
+ { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x03, 0x59}, CMD_DAT_INT, 1 },
+ { {.s = RIG_PARM_SCREENSAVER}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x38}, CMD_DAT_INT, 1 },
+ { {.s = RIG_PARM_NONE} }
+};
+
/*
* IC-7300 S-meter levels measured from live signals on multiple bands. Provides a good approximation.
*/
@@ -125,6 +133,14 @@ struct cmdparams ic7300_extcmds[] =
} }
+/*
+ * IC705 items that differ from IC7300
+ */
+#define IC705_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
+#define IC705_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|RIG_MODE_PKTAM|RIG_MODE_DSTAR)
+#define IC705_OTHER_TX_MODES (RIG_MODE_FM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR)
+#define IC705_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_BRIGHT)
+
/*
* IC9700 items that differ from IC7300
*/
@@ -134,8 +150,8 @@ struct cmdparams ic7300_extcmds[] =
#define IC9700_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF_RAW|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB)
#define IC9700_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL)
#define IC9700_SCAN_OPS (RIG_SCAN_STOP|RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_SLCT)
-#define IC9700_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD|RIG_MODE_DSTAR)
-#define IC9700_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD|RIG_MODE_DSTAR)
+#define IC9700_ALL_TX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD)
+#define IC9700_ALL_RX_MODES (RIG_MODE_FM|RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_DSTAR|RIG_MODE_DD)
struct cmdparams ic9700_extcmds[] =
{
@@ -236,6 +252,23 @@ static const struct icom_priv_caps IC9700_priv_caps =
.extcmds = ic9700_extcmds, /* Custom op parameters */
};
+static const struct icom_priv_caps IC705_priv_caps =
+{
+ 0xA4, /* default address */
+ 0, /* 731 mode */
+ 1, /* no XCHG to avoid display flickering */
+ ic705_ts_sc_list,
+ .serial_USB_echo_check = 1, /* USB CI-V may not echo */
+ .agc_levels_present = 1,
+ .agc_levels = {
+ { .level = RIG_AGC_FAST, .icom_level = 1 },
+ { .level = RIG_AGC_MEDIUM, .icom_level = 2 },
+ { .level = RIG_AGC_SLOW, .icom_level = 3 },
+ { .level = -1, .icom_level = 0 },
+ },
+ .extcmds = ic705_extcmds, /* Custom op parameters */
+};
+
const struct rig_caps ic7300_caps =
{
RIG_MODEL(RIG_MODEL_IC7300),
@@ -288,31 +321,26 @@ const struct rig_caps ic7300_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
- { 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},
- .rx_range_list1 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
+ .rx_range_list1 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END,
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END
+ },
.tx_range_list1 = {
- FRQ_RNG_HF(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_4m(1, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(12.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
- RIG_FRNG_END,
- },
-
- .rx_range_list2 = { {kHz(30), MHz(74.8), IC7300_ALL_RX_MODES, -1, -1, IC7300_VFOS}, RIG_FRNG_END, },
- .tx_range_list2 = {
- FRQ_RNG_HF(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_60m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_6m(2, IC7300_OTHER_TX_MODES, W(2), W(100), IC7300_VFOS, RIG_ANT_1),
- FRQ_RNG_HF(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_60m(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
- FRQ_RNG_6m(2, IC7300_AM_TX_MODES, W(1), W(25), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_HF(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_60m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_6m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_4m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_2m(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_70cm(1, IC705_OTHER_TX_MODES, W(2), W(10), IC7300_VFOS, RIG_ANT_1),
+ FRQ_RNG_HF(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_60m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_6m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_4m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_2m(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
+ FRQ_RNG_70cm(1, IC7300_AM_TX_MODES, W(1), W(2.5), IC7300_VFOS, RIG_ANT_1), /* AM class */
RIG_FRNG_END,
},
@@ -662,3 +690,207 @@ const struct rig_caps ic9700_caps =
.send_morse = icom_send_morse,
.send_voice_mem = icom_send_voice_mem
};
+
+const struct rig_caps ic705_caps =
+{
+ RIG_MODEL(RIG_MODEL_IC705),
+ .model_name = "IC-705",
+ .mfg_name = "Icom",
+ .version = BACKEND_VER ".0",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_ALPHA,
+ .rig_type = RIG_TYPE_TRANSCEIVER,
+ .ptt_type = RIG_PTT_RIG,
+ .dcd_type = RIG_DCD_RIG,
+ .port_type = RIG_PORT_SERIAL,
+ .serial_rate_min = 4800,
+ .serial_rate_max = 19200,
+ .serial_data_bits = 8,
+ .serial_stop_bits = 1,
+ .serial_parity = RIG_PARITY_NONE,
+ .serial_handshake = RIG_HANDSHAKE_NONE,
+ .write_delay = 0,
+ .post_write_delay = 0,
+ .timeout = 1000,
+ .retry = 3,
+ .has_get_func = IC7300_FUNCS,
+ .has_set_func = IC7300_FUNCS,
+ .has_get_level = IC705_LEVELS,
+ .has_set_level = RIG_LEVEL_SET(IC705_LEVELS),
+ .has_get_parm = IC7300_PARMS,
+ .has_set_parm = RIG_PARM_SET(IC7300_PARMS),
+ .level_gran = {
+ [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
+ [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
+ [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
+ [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
+ },
+ .parm_gran = {},
+ .extlevels = NULL,
+ .ctcss_list = full_ctcss_list,
+ .dcs_list = NULL,
+ .preamp = { 1, 2, RIG_DBLST_END, },
+ .attenuator = { 20, RIG_DBLST_END, },
+ .max_rit = Hz(9999),
+ .max_xit = Hz(9999),
+ .max_ifshift = Hz(0),
+ .targetable_vfo = 0,
+ .vfo_ops = IC7300_VFO_OPS,
+ .scan_ops = IC7300_SCAN_OPS,
+ .transceive = RIG_TRN_RIG,
+ .bank_qty = 5,
+ .chan_desc_sz = 0,
+
+ .chan_list = {
+ { 1, 99, RIG_MTYPE_MEM },
+ RIG_CHAN_END,
+ },
+
+ .rx_range_list1 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "USA"},
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "USA"},
+ RIG_FRNG_END,
+ },
+ .tx_range_list1 = {
+ { kHz(1800), MHz(1.999999),IC705_ALL_TX_MODES, W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(3.5), MHz(3.999999),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(5.255), MHz(5.405),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(7.0), MHz(7.3),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(10.1), MHz(10.15),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(14.0), MHz(14.35),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(18.068), MHz(18.168),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(21.00), MHz(21.45),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(24.89), MHz(24.99),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(28.00), MHz(29.70),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(50.00), MHz(54.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(144.00), MHz(148.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ { MHz(430.00), MHz(450.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "USA" },
+ RIG_FRNG_END,
+ },
+
+ .rx_range_list2 = {
+ {kHz(30), MHz(199.999999), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "EUR"},
+ {MHz(400), MHz(470), IC705_ALL_RX_MODES, -1, -1, IC7300_VFOS, RIG_ANT_1, "EUR"},
+ RIG_FRNG_END,
+ },
+ .tx_range_list2 = {
+ { kHz(1810), MHz(1.999999),IC705_ALL_TX_MODES, W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(3.5), MHz(3.8),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(7.0), MHz(7.2),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(10.1), MHz(10.15),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(14.0), MHz(14.35),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(18.068), MHz(18.168),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(21.00), MHz(21.45),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(24.89), MHz(24.99),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(28.00), MHz(29.70),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(50.00), MHz(52.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(144.00), MHz(146.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ { MHz(430.00), MHz(440.00),IC705_ALL_TX_MODES ,W(0.1) , W(10) , IC7300_VFOS, RIG_ANT_1, "EUR" },
+ RIG_FRNG_END,
+ },
+
+ .tuning_steps = {
+ {IC7300_ALL_RX_MODES, Hz(100)},
+ {IC7300_ALL_RX_MODES, kHz(.5)},
+ {IC7300_ALL_RX_MODES, kHz(1)},
+ {IC7300_ALL_RX_MODES, kHz(5)},
+ {IC7300_ALL_RX_MODES, kHz(6.25)},
+ {IC7300_ALL_RX_MODES, kHz(8.33)},
+ {IC7300_ALL_RX_MODES, kHz(9)},
+ {IC7300_ALL_RX_MODES, kHz(10)},
+ {IC7300_ALL_RX_MODES, kHz(12.5)},
+ {IC7300_ALL_RX_MODES, kHz(20)},
+ {IC7300_ALL_RX_MODES, kHz(25)},
+ {IC7300_ALL_RX_MODES, kHz(50)},
+ {IC7300_ALL_RX_MODES, kHz(100)},
+ RIG_TS_END,
+ },
+
+ /* mode/filter list, remember: order matters! But duplication may speed up search. Put the most commonly used modes first! Remember these are defaults, with dsp rigs you can change them to anything you want except FM and WFM which are fixed */
+ .filters = {
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(3.6)},
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(2.4)},
+ {RIG_MODE_SSB | RIG_MODE_PKTLSB | RIG_MODE_PKTUSB, kHz(1.8)},
+ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(500)},
+ {RIG_MODE_CW | RIG_MODE_CWR | RIG_MODE_RTTY | RIG_MODE_RTTYR, Hz(250)},
+ {RIG_MODE_CW | RIG_MODE_CWR, kHz(1.2)},
+ {RIG_MODE_RTTY | RIG_MODE_RTTYR, kHz(2.4)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(6)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(3)},
+ {RIG_MODE_AM | RIG_MODE_PKTAM, kHz(9)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(10)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(7)},
+ {RIG_MODE_FM | RIG_MODE_PKTFM, kHz(15)},
+ RIG_FLT_END,
+ },
+
+ .str_cal = IC7300_STR_CAL,
+ .swr_cal = IC7300_SWR_CAL,
+ .alc_cal = IC7300_ALC_CAL,
+ .rfpower_meter_cal = IC7300_RFPOWER_METER_CAL,
+ .comp_meter_cal = IC7300_COMP_METER_CAL,
+ .vd_meter_cal = IC7300_VD_METER_CAL,
+ .id_meter_cal = IC7300_ID_METER_CAL,
+
+ .cfgparams = icom_cfg_params,
+ .set_conf = icom_set_conf,
+ .get_conf = icom_get_conf,
+
+ .priv = (void *)& IC705_priv_caps,
+ .rig_init = icom_init,
+ .rig_cleanup = icom_cleanup,
+ .rig_open = icom_rig_open,
+ .rig_close = icom_rig_close,
+
+ .set_freq = icom_set_freq,
+ .get_freq = icom_get_freq,
+ .set_mode = icom_set_mode_with_data,
+ .get_mode = icom_get_mode_with_data,
+//.get_vfo = icom_get_vfo,
+ .set_vfo = icom_set_vfo,
+ .set_ant = NULL,
+ .get_ant = NULL,
+
+ .set_rit = icom_set_rit_new,
+ .get_rit = icom_get_rit_new,
+ .get_xit = icom_get_rit_new,
+ .set_xit = icom_set_xit_new,
+
+ .decode_event = icom_decode_event,
+ .set_level = icom_set_level,
+ .get_level = icom_get_level,
+ .set_ext_level = icom_set_ext_level,
+ .get_ext_level = icom_get_ext_level,
+ .set_func = icom_set_func,
+ .get_func = icom_get_func,
+ .set_parm = icom_set_parm,
+ .get_parm = icom_get_parm,
+ .set_mem = icom_set_mem,
+ .vfo_op = icom_vfo_op,
+ .scan = icom_scan,
+ .set_ptt = icom_set_ptt,
+ .get_ptt = icom_get_ptt,
+ .get_dcd = icom_get_dcd,
+ .set_ts = icom_set_ts,
+ .get_ts = icom_get_ts,
+ .set_rptr_shift = icom_set_rptr_shift,
+ .get_rptr_shift = icom_get_rptr_shift,
+ .set_rptr_offs = icom_set_rptr_offs,
+ .get_rptr_offs = icom_get_rptr_offs,
+ .set_ctcss_tone = icom_set_ctcss_tone,
+ .get_ctcss_tone = icom_get_ctcss_tone,
+ .set_ctcss_sql = icom_set_ctcss_sql,
+ .get_ctcss_sql = icom_get_ctcss_sql,
+ .set_split_freq = icom_set_split_freq,
+ .get_split_freq = icom_get_split_freq,
+ .set_split_mode = icom_set_split_mode,
+ .get_split_mode = icom_get_split_mode,
+ .set_split_vfo = icom_set_split_vfo,
+ .get_split_vfo = icom_get_split_vfo,
+ .set_powerstat = icom_set_powerstat,
+ .get_powerstat = icom_get_powerstat,
+ .power2mW = icom_power2mW,
+ .mW2power = icom_mW2power,
+ .send_morse = icom_send_morse,
+ .send_voice_mem = icom_send_voice_mem
+};
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 446e3924..24a6cd32 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -353,6 +353,26 @@ const struct ts_sc_list r8600_ts_sc_list[] =
{0, 0},
};
+const struct ts_sc_list ic705_ts_sc_list[] =
+{
+ {10, 0x00},
+ {100, 0x01},
+ {500, 0x02},
+ {kHz(1), 0x03},
+ {kHz(5), 0x04},
+ {kHz(6.25), 0x05},
+ {kHz(8.33), 0x06},
+ {kHz(9), 0x07},
+ {kHz(10), 0x08},
+ {kHz(12.5), 0x09},
+ {kHz(20), 0x10},
+ {kHz(25), 0x11},
+ {kHz(50), 0x12},
+ {kHz(100), 0x13},
+ {0, 0x13}, /* programmable tuning step not supported */
+ {0, 0},
+};
+
/* rtty filter list for some DSP rigs ie PRO */
@@ -2633,6 +2653,11 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
lvl_sc = S_LVL_MON;
break;
+ case RIG_LEVEL_BRIGHT:
+ lvl_cn = C_CTL_LVL;
+ lvl_sc = S_LVL_BRIGHT;
+ break;
+
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__,
rig_strlevel(level));
@@ -7409,6 +7434,7 @@ DECLARE_INITRIG_BACKEND(icom)
rig_debug(RIG_DEBUG_VERBOSE, "%s: _init called\n", __func__);
rig_register(&ic703_caps);
+ rig_register(&ic705_caps);
rig_register(&ic706_caps);
rig_register(&ic706mkii_caps);
rig_register(&ic706mkiig_caps);
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 47a12f86..b5959882 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20200720"
+#define BACKEND_VER "20200906"
/*
* defines used by comp_cal_str in rig.c
@@ -202,6 +202,7 @@ extern const struct ts_sc_list r9000_ts_sc_list[];
extern const struct ts_sc_list r9500_ts_sc_list[];
extern const struct ts_sc_list ic756_ts_sc_list[];
extern const struct ts_sc_list ic756pro_ts_sc_list[];
+extern const struct ts_sc_list ic705_ts_sc_list[];
extern const struct ts_sc_list ic706_ts_sc_list[];
extern const struct ts_sc_list ic7000_ts_sc_list[];
extern const struct ts_sc_list ic7100_ts_sc_list[];
@@ -322,6 +323,7 @@ extern const struct confparams icom_ext_parms[];
extern const struct cmdparams icom_ext_cmds[];
extern const struct rig_caps ic703_caps;
+extern const struct rig_caps ic705_caps;
extern const struct rig_caps ic706_caps;
extern const struct rig_caps ic706mkii_caps;
extern const struct rig_caps ic706mkiig_caps;
diff --git a/src/idx_builtin.h b/src/idx_builtin.h
index e95a0b5c..d52b2779 100644
--- a/src/idx_builtin.h
+++ b/src/idx_builtin.h
@@ -150,7 +150,8 @@
#define LVL_NB setting2idx_builtin(RIG_LEVEL_NB)
-#define LVL_39 setting2idx_builtin(RIG_LEVEL_41)
+#define LVL_BRIGHT setting2idx_builtin(RIG_LEVEL_BRIGHT)
+
#define LVL_40 setting2idx_builtin(RIG_LEVEL_40)
#define LVL_41 setting2idx_builtin(RIG_LEVEL_41)
#define LVL_42 setting2idx_builtin(RIG_LEVEL_42)
diff --git a/src/misc.c b/src/misc.c
index a8c81175..56c3656a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -683,6 +683,7 @@ static struct
{ RIG_LEVEL_NOTCHF_RAW, "NOTCHF_RAW" },
{ RIG_LEVEL_MONITOR_GAIN, "MONITOR_GAIN" },
{ RIG_LEVEL_NB, "NB" },
+ { RIG_LEVEL_BRIGHT, "BRIGHT" },
{ RIG_LEVEL_NONE, "" },
};
diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c
index abe597af..b0a5ca36 100644
--- a/tests/dumpcaps.c
+++ b/tests/dumpcaps.c
@@ -486,7 +486,7 @@ int dumpcaps(RIG *rig, FILE *fout)
status = range_sanity_check(caps->tx_range_list1, 0);
fprintf(fout,
- "TX ranges #1 status for:%s \t%s (%d)\n", label1,
+ "TX ranges #1 status for %s:\t%s (%d)\n", label1,
status ? "Bad" : "OK",
status);
diff --git a/tests/dumpmem.c b/tests/dumpmem.c
index 9f965b53..97cf6edc 100644
--- a/tests/dumpmem.c
+++ b/tests/dumpmem.c
@@ -397,5 +397,10 @@ int dump_chan(RIG *rig, int chan_num)
printf("BKINDL: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BKINDL)].i);
}
+ if (rig_has_set_level(rig, RIG_LEVEL_BRIGHT))
+ {
+ printf("BRIGHT: %d\n", chan.levels[rig_setting2idx(RIG_LEVEL_BRIGHT)].i);
+ }
+
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
cppcheck.sh | 6 +-
include/hamlib/rig.h | 2 +-
include/hamlib/riglist.h | 3 +-
rigs/icom/ic7300.c | 278 +++++++++++++++++++++++++++++++++++++++++++----
rigs/icom/icom.c | 26 +++++
rigs/icom/icom.h | 4 +-
src/idx_builtin.h | 3 +-
src/misc.c | 1 +
tests/dumpcaps.c | 2 +-
tests/dumpmem.c | 5 +
10 files changed, 299 insertions(+), 31 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 15:54:53
|
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, Hamlib-4.0 has been updated
via cee9c9e75521d24db0e0efb540b05deb32131538 (commit)
via 60e9a2fbbb509d04cb309bce5e1f57506f96fcb2 (commit)
from 88abf1fce346521bc1dc50f82a79982a7e566dfb (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 cee9c9e75521d24db0e0efb540b05deb32131538
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 5 08:07:07 2020 -0500
Advance to 4.0~rc1
diff --git a/configure.ac b/configure.ac
index 05098a62..21f860fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl however, the use of '~' should be fine as apt (others?) will treat
dnl it as an earlier version than the actual release. TNX KA6MAL
dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
AC_INIT([Hamlib],
- [4.0~git],
+ [4.0~rc1],
[ham...@li...],
[hamlib],
[http://www.hamlib.org])
commit 60e9a2fbbb509d04cb309bce5e1f57506f96fcb2
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 5 07:53:40 2020 -0500
Remove 05 Sep as release date.
Sigh...
(cherry picked from commit 24392e671189a379c1e241ed210ca97418aa7313)
diff --git a/NEWS b/NEWS
index f056f4df..05f5c8c2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,8 @@ Copyright (C) 2000-2020 Michael Black W9MDB, and others
Please send Hamlib bug reports to ham...@li...
-Version 4.0-rc1
- 2020-09-05
+Version 4.0
+ 2020-09-??
* API/ABI changes, advance ABI to 4 0 0.
* Add GPIO and GPION options for DCD. Jeroen Vreeken
* New backend: ELAD FDM DUO. Giovanni, HB9EIK.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 ++--
configure.ac | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 15:45:29
|
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 annotated tag, v4.0rc1 has been deleted
was 88eb1cedb943f7d21c1d23d647833cba43b3827b
- Log -----------------------------------------------------------------
6f8100ffc0ba555b8dae96a56d61fefbb7624c06 Fix cppcheck warnings
-----------------------------------------------------------------------
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 12:59:21
|
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 120c6b2ca61a31147203e17be4e2e6d02e2bfcd9 (commit)
from 24392e671189a379c1e241ed210ca97418aa7313 (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 120c6b2ca61a31147203e17be4e2e6d02e2bfcd9
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 5 07:58:24 2020 -0500
Advance to 4.1~git
diff --git a/configure.ac b/configure.ac
index 05098a62..e4839d18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl however, the use of '~' should be fine as apt (others?) will treat
dnl it as an earlier version than the actual release. TNX KA6MAL
dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
AC_INIT([Hamlib],
- [4.0~git],
+ [4.1~git],
[ham...@li...],
[hamlib],
[http://www.hamlib.org])
@@ -61,7 +61,7 @@ dnl See README.release on setting these values
# Values given to -version-info when linking. See libtool documentation.
# Set them here to keep c++/Makefile and src/Makefile in sync.
ABI_VERSION=4
-ABI_REVISION=0
+ABI_REVISION=1
ABI_AGE=0
AC_DEFINE_UNQUOTED([ABI_VERSION], [$ABI_VERSION], [Frontend ABI version])
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 12:55:00
|
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 24392e671189a379c1e241ed210ca97418aa7313 (commit)
from 88abf1fce346521bc1dc50f82a79982a7e566dfb (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 24392e671189a379c1e241ed210ca97418aa7313
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 5 07:53:40 2020 -0500
Remove 05 Sep as release date.
Sigh...
diff --git a/NEWS b/NEWS
index f056f4df..05f5c8c2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,8 @@ Copyright (C) 2000-2020 Michael Black W9MDB, and others
Please send Hamlib bug reports to ham...@li...
-Version 4.0-rc1
- 2020-09-05
+Version 4.0
+ 2020-09-??
* API/ABI changes, advance ABI to 4 0 0.
* Add GPIO and GPION options for DCD. Jeroen Vreeken
* New backend: ELAD FDM DUO. Giovanni, HB9EIK.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 12:48:38
|
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, Hamlib-4.0 has been created
at 88abf1fce346521bc1dc50f82a79982a7e566dfb (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Nate B. <n0...@us...> - 2020-09-05 12:46:43
|
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 88abf1fce346521bc1dc50f82a79982a7e566dfb (commit)
from d18196f685bd632ca831c976ed2a50a4f2bdf428 (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 88abf1fce346521bc1dc50f82a79982a7e566dfb
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 5 07:41:37 2020 -0500
Update NEWS
diff --git a/NEWS b/NEWS
index 6ac54b6f..f056f4df 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,8 @@ Copyright (C) 2000-2020 Michael Black W9MDB, and others
Please send Hamlib bug reports to ham...@li...
-Version 4.0
- 2020-??-??
+Version 4.0-rc1
+ 2020-09-05
* API/ABI changes, advance ABI to 4 0 0.
* Add GPIO and GPION options for DCD. Jeroen Vreeken
* New backend: ELAD FDM DUO. Giovanni, HB9EIK.
@@ -20,14 +20,16 @@ Version 4.0
* Fix a lot of static code analysis errors and warnings. Mike, W9MDB
* Rearrange directory structure to put rigs and rotators sources
under their own subdirectories. Mike, W9MDB
- * rig_get_channel changed to add read_only flag
- * rigctl(d) f command also returns VFO now
- * caching of vfo, frequency, mode, and ptt speeds up rigctld for all
- * caching of kenwood/yaesu "IF" speeds up polling from WSJTX/JTDX
- * rig_get_channel now has read_only flag but it still needs to be implemented based on rig behavior
- * So if you use rig_get_channel you may get a RIG_ENIMPL error to contact us for fixing it
- * New rig backend for Elecraft K4
- * New rig backend for PowerSDR (Flex and Apache users)
+ * rig_get_channel changed to add read_only flag.
+ * rigctl(d) f command also returns VFO now.
+ * caching of vfo, frequency, mode, and ptt speeds up rigctld for all.
+ * caching of kenwood/yaesu "IF" speeds up polling from WSJTX/JTDX.
+ * rig_get_channel now has read_only flag but it still needs to be
+ implemented based on rig behavior, so if you use rig_get_channel you
+ may get a RIG_ENIMPL error to contact us for fixing it.
+ * New rig backend for Elecraft K4.
+ * New rig backend for PowerSDR (Flex and Apache users).
+ * Many fixes and enhancements. Mike, W9MDB and many contributors
Version 3.3
2018-08-12
-----------------------------------------------------------------------
Summary of changes:
NEWS | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-04 22:42:31
|
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 d18196f685bd632ca831c976ed2a50a4f2bdf428 (commit)
from 481cdbd62c18347b94deab9d30965b43403a284d (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 d18196f685bd632ca831c976ed2a50a4f2bdf428
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Sep 4 17:42:11 2020 -0500
Lower log level of debug statement
diff --git a/src/rig.c b/src/rig.c
index 0df350a1..cbac4821 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2242,7 +2242,7 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
&& rs->pttport.fd < 0
&& RIG_PTT_OFF != ptt)
{
- rig_debug(RIG_DEBUG_ERR, "%s: PTT RTS debug#1\n", __func__);
+ rig_debug(RIG_DEBUG_TRACE, "%s: PTT RTS debug#1\n", __func__);
rs->pttport.fd = ser_open(&rs->pttport);
-----------------------------------------------------------------------
Summary of changes:
src/rig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-04 12:49:58
|
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 481cdbd62c18347b94deab9d30965b43403a284d (commit)
via 86777dcf782ba5161272ffd4d54a2ea29b5e4d39 (commit)
from 110cfe7abda137c71026604c4afc19f34ed0f8b5 (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 481cdbd62c18347b94deab9d30965b43403a284d
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Sep 4 07:26:11 2020 -0500
Fix linking for ft817_set_powerstat
diff --git a/rigs/yaesu/ft817.h b/rigs/yaesu/ft817.h
index 30b3314b..d5f1a219 100644
--- a/rigs/yaesu/ft817.h
+++ b/rigs/yaesu/ft817.h
@@ -158,7 +158,7 @@ static int ft817_set_rptr_shift (RIG *rig, vfo_t vfo, rptr_shift_t shift);
static int ft817_set_rptr_offs (RIG *rig, vfo_t vfo, shortfreq_t offs);
static int ft817_set_rit (RIG *rig, vfo_t vfo, shortfreq_t rit);
static int ft817_get_dcd (RIG *rig, vfo_t vfo, dcd_t *dcd);
-static int ft817_set_powerstat (RIG *rig, powerstat_t status);
+int ft817_set_powerstat (RIG *rig, powerstat_t status);
static int ft817_vfo_op (RIG *rig, vfo_t vfo, vfo_op_t op);
static int ft817_get_split_vfo (RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo);
static int ft817_set_split_vfo (RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo);
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index 1e90ddfd..15ec9d52 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -321,6 +321,7 @@ const struct rig_caps ft897_caps =
.set_ctcss_tone = ft897_set_ctcss_tone,
.set_dcs_sql = ft897_set_dcs_sql,
.set_ctcss_sql = ft897_set_ctcss_sql,
+ .set_powerstat = ft817_set_powerstat,
.get_level = ft897_get_level,
.set_func = ft897_set_func,
.vfo_op = ft897_vfo_op,
commit 86777dcf782ba5161272ffd4d54a2ea29b5e4d39
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Sep 3 17:07:09 2020 -0500
Fix set_powerstat for ft817 and add for ft857 ft897
https://github.com/Hamlib/Hamlib/issues/363
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index d9d1fe3e..ba3407be 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -111,7 +111,7 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xe7 } }, /* get RX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xf7 } }, /* get TX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x03 } }, /* get FREQ and MODE status */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* pwr wakeup sequence */
+ { 1, { 0xff, 0xff, 0xff, 0xff, 0xff } }, /* pwr wakeup sequence */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0f } }, /* pwr on */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x8f } }, /* pwr off */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0xbb } }, /* eeprom read */
@@ -164,7 +164,7 @@ const struct rig_caps ft817_caps =
RIG_MODEL(RIG_MODEL_FT817),
.model_name = "FT-817",
.mfg_name = "Yaesu",
- .version = "20200821.0",
+ .version = "20200903.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1383,6 +1383,7 @@ int ft817_set_powerstat(RIG *rig, powerstat_t status)
return ft817_send_cmd(rig, FT817_NATIVE_CAT_PWR_OFF);
case RIG_POWER_ON:
+ ft817_send_cmd(rig, FT817_NATIVE_CAT_PWR_WAKE);
return ft817_send_cmd(rig, FT817_NATIVE_CAT_PWR_ON);
case RIG_POWER_STANDBY:
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index aa084df3..3f71100d 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -118,7 +118,7 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xe7 } }, /* get RX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xf7 } }, /* get TX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x03 } }, /* get FREQ and MODE status */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* pwr wakeup sequence */
+ { 1, { 0xff, 0xff, 0xff, 0xff, 0xff } }, /* pwr wakeup sequence */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0f } }, /* pwr on */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x8f } }, /* pwr off */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0xbb } }, /* eeprom read */
@@ -147,6 +147,7 @@ enum ft857_digi
#define FT857_ANTS 0
extern int ft817_read_ack(RIG *rig);
+extern int ft817_set_powerstat(RIG *rig, powerstat_t status);
static int ft857_send_icmd(RIG *rig, int index, unsigned char *data);
const struct rig_caps ft857_caps =
@@ -285,6 +286,8 @@ const struct rig_caps ft857_caps =
.set_ctcss_tone = ft857_set_ctcss_tone,
.set_dcs_sql = ft857_set_dcs_sql,
.set_ctcss_sql = ft857_set_ctcss_sql,
+ .set_powerstat = ft817_set_powerstat,
+
.get_level = ft857_get_level,
.set_func = ft857_set_func,
.vfo_op = ft857_vfo_op,
@@ -1379,26 +1382,5 @@ int ft857_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
return -RIG_EINVAL;
}
-#if 0
-/*
- * This doesn't seem to work on FT857. It might work with FT817 though.
- */
-int ft857_set_powerstat(RIG *rig, powerstat_t status)
-{
- switch (status)
- {
- case RIG_POWER_OFF:
- return ft857_send_cmd(rig, FT857_NATIVE_CAT_PWR_OFF);
-
- case RIG_POWER_ON:
- return ft857_send_cmd(rig, FT857_NATIVE_CAT_PWR_ON);
-
- case RIG_POWER_STANDBY:
- default:
- return -RIG_EINVAL;
- }
-}
-#endif
-
/* ---------------------------------------------------------------------- */
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index ff489c4f..1e90ddfd 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -112,7 +112,7 @@ static int ft897_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs);
static int ft897_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit);
static int ft897_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd);
extern int ft817_read_ack(RIG *rig);
-// static int ft897_set_powerstat(RIG *rig, powerstat_t status);
+extern int ft817_set_powerstat(RIG *rig, powerstat_t status);
/* Native ft897 cmd set prototypes. These are READ ONLY as each */
/* rig instance will copy from these and modify if required . */
@@ -158,7 +158,7 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xe7 } }, /* get RX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xf7 } }, /* get TX status */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x03 } }, /* get FREQ and MODE status */
- { 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* pwr wakeup sequence */
+ { 1, { 0xff, 0xff, 0xff, 0xff, 0xff } }, /* pwr wakeup sequence */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0f } }, /* pwr on */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x8f } }, /* pwr off */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0xbb } }, /* eeprom read */
@@ -191,7 +191,7 @@ const struct rig_caps ft897_caps =
RIG_MODEL(RIG_MODEL_FT897),
.model_name = "FT-897",
.mfg_name = "Yaesu",
- .version = "20200628.0",
+ .version = "20200903.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1376,26 +1376,5 @@ int ft897_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
return RIG_OK;
}
-#if 0
-/*
- * This doesn't seem to work on FT897. It might work with FT817 though.
- */
-int ft897_set_powerstat(RIG *rig, powerstat_t status)
-{
- switch (status)
- {
- case RIG_POWER_OFF:
- return ft897_send_cmd(rig, FT897_NATIVE_CAT_PWR_OFF);
-
- case RIG_POWER_ON:
- return ft897_send_cmd(rig, FT897_NATIVE_CAT_PWR_ON);
-
- case RIG_POWER_STANDBY:
- default:
- return -RIG_EINVAL;
- }
-}
-#endif
-
/* ---------------------------------------------------------------------- */
-----------------------------------------------------------------------
Summary of changes:
rigs/yaesu/ft817.c | 5 +++--
rigs/yaesu/ft817.h | 2 +-
rigs/yaesu/ft857.c | 26 ++++----------------------
rigs/yaesu/ft897.c | 28 ++++------------------------
4 files changed, 12 insertions(+), 49 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-03 03:14:05
|
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 110cfe7abda137c71026604c4afc19f34ed0f8b5 (commit)
via fade1681faf6dcea09133e02a1603af4897fb61e (commit)
via dd3b1b71d0e80598119f194686fedc460b2045fc (commit)
from a0ee4d01b2e16c01f56d7a2fa08fb456a23fc894 (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 110cfe7abda137c71026604c4afc19f34ed0f8b5
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Sep 2 22:13:11 2020 -0500
Remove warning from ampctl.c
diff --git a/tests/ampctl.c b/tests/ampctl.c
index cbd8da64..9c54b0f4 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -49,7 +49,6 @@ extern char *readline();
#else
/* no readline */
#endif /* HAVE_LIBREADLINE */
-#warn here1
#ifdef HAVE_READLINE_HISTORY
# include <sys/stat.h>
# define HST_SHRT_OPTS "iI"
commit fade1681faf6dcea09133e02a1603af4897fb61e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Sep 2 16:56:11 2020 -0500
Fix cppcheck errors and warnings
diff --git a/dummy/dummy.c b/dummy/dummy.c
index 6e748861..85682c63 100644
--- a/dummy/dummy.c
+++ b/dummy/dummy.c
@@ -1061,7 +1061,6 @@ static int dummy_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
// cppcheck-suppress *
level1 = LVL_ATT;
- // cppcheck-suppress *
level2 = LVL_PREAMP;
curr->levels[idx].i = qrm + (time(NULL) % 32) + (rand() % 4)
- curr->levels[level1].i + curr->levels[level2].i;
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 9b3fb372..5b3d18bc 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -1048,7 +1048,6 @@ int aor_set_channel(RIG *rig, const channel_t *chan)
cmd_len += priv->format_mode(rig, aorcmd + cmd_len, chan->mode, chan->width);
- // cppcheck-suppress *
cmd_len += sprintf(aorcmd + cmd_len, " AT%d TM%12s%s",
chan->levels[LVL_ATT].i ? 1 : 0, chan->channel_desc, EOM);
diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index 4165206d..18aebb4d 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -128,7 +128,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
/*
* should check return code and that write wrote cmd_len chars!
*/
- // cppcheck-suppress *
Hold_Decode(rig);
rig_flush(&rs->rigport);
@@ -137,7 +136,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
if (retval != RIG_OK)
{
- // cppcheck-suppress *
Unhold_Decode(rig);
return retval;
}
@@ -159,7 +157,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
if (retval == -RIG_ETIMEOUT || retval == 0)
{
/* Nothing received, CI-V interface is not echoing */
- // cppcheck-suppress *
Unhold_Decode(rig);
return -RIG_BUSERROR;
}
@@ -167,8 +164,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
if (retval < 0)
{
/* Other error, return it */
- // cppcheck-suppress *
- Unhold_Decode(rig);
return retval;
}
@@ -181,7 +176,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
{
case COL:
/* Collision */
- // cppcheck-suppress *
Unhold_Decode(rig);
return -RIG_BUSBUSY;
@@ -192,7 +186,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
default:
/* Timeout after reading at least one character */
/* Problem on ci-v bus? */
- // cppcheck-suppress *
Unhold_Decode(rig);
return -RIG_BUSERROR;
}
@@ -202,7 +195,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
/* Not the same length??? */
/* Problem on ci-v bus? */
/* Someone else got a packet in? */
- // cppcheck-suppress *
Unhold_Decode(rig);
return -RIG_EPROTO;
}
@@ -212,7 +204,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
/* Frames are different? */
/* Problem on ci-v bus? */
/* Someone else got a packet in? */
- // cppcheck-suppress *
Unhold_Decode(rig);
return -RIG_EPROTO;
}
@@ -223,7 +214,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
*/
if (data_len == NULL)
{
- // cppcheck-suppress *
Unhold_Decode(rig);
return RIG_OK;
}
@@ -244,7 +234,6 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
frm_len = read_icom_frame(&rs->rigport, buf, sizeof(buf));
}
- // cppcheck-suppress *
Unhold_Decode(rig);
if (frm_len < 0)
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 846acdfd..446e3924 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1870,13 +1870,19 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
* Lets check for dsp filters
*/
- if (width && (retval = icom_get_dsp_flt(rig, *mode)) != 0)
+ if (width != NULL && (retval = icom_get_dsp_flt(rig, *mode)) != 0)
{
*width = retval;
+ rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s returning mode=%s, width=%d\n", __func__,
+ rig_strvfo(vfo), rig_strrmode(*mode), (int)*width);
+ }
+ else
+ {
+ rig_debug(RIG_DEBUG_TRACE,
+ "%s: vfo=%s returning mode=%s, width not available\n", __func__,
+ rig_strvfo(vfo), rig_strrmode(*mode));
}
- rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s returning mode=%s, width=%d\n", __func__,
- rig_strvfo(vfo), rig_strrmode(*mode), (int)*width);
return RIG_OK;
}
diff --git a/rigs/jrc/jrc.c b/rigs/jrc/jrc.c
index c4bf4e11..5e08bd5e 100644
--- a/rigs/jrc/jrc.c
+++ b/rigs/jrc/jrc.c
@@ -77,7 +77,6 @@ static int jrc_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rig_flush(&rs->rigport);
- // cppcheck-suppress *
Hold_Decode(rig);
retval = write_block(&rs->rigport, cmd, cmd_len);
diff --git a/rigs/kenwood/ts950.c b/rigs/kenwood/ts950.c
index 08e08378..40540a39 100644
--- a/rigs/kenwood/ts950.c
+++ b/rigs/kenwood/ts950.c
@@ -217,8 +217,8 @@ const struct rig_caps ts950sdx_caps =
.serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
- .post_write_delay = 0,
- .timeout = 500, // this rig takes over 250ms to respond an IF command
+ .post_write_delay = 50,
+ .timeout = 600, // this rig takes over 250ms to respond an IF command
.retry = 10,
.has_get_func = RIG_FUNC_NONE,
diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c
index 0b841a9d..01424046 100644
--- a/rigs/prm80/prm80.c
+++ b/rigs/prm80/prm80.c
@@ -441,13 +441,11 @@ int prm80_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
switch (level)
{
case RIG_LEVEL_AF:
- // cppcheck-suppress *
val->f = chan.levels[LVL_AF].f;
break;
case RIG_LEVEL_SQL:
- // cppcheck-suppress *
val->f = chan.levels[LVL_SQL].f;
break;
diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c
index d910683d..414ba79a 100644
--- a/rigs/tentec/tt550.c
+++ b/rigs/tentec/tt550.c
@@ -82,7 +82,6 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
* Hold_Decode keeps the asynchronous decode routine from being called
* when we get data back from a normal command.
*/
- // cppcheck-suppress *
Hold_Decode(rig);
rig_flush(&rs->rigport);
@@ -91,7 +90,6 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
if (retval != RIG_OK)
{
- // cppcheck-suppress *
Unhold_Decode(rig);
return retval;
}
@@ -101,7 +99,6 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
*/
if (!data || !data_len)
{
- // cppcheck-suppress *
Unhold_Decode(rig);
return 0;
}
@@ -120,7 +117,6 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
*data_len = retval;
- // cppcheck-suppress *
Unhold_Decode(rig);
return RIG_OK;
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index befa3887..6a37a7aa 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -769,7 +769,6 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
to_bcd(p->p_cmd, freq / 10, 8); /* store bcd format in in p_cmd */
/* TODO -- fix 10Hz resolution -- FS */
- // cppcheck-suppress *
rig_debug(RIG_DEBUG_TRACE,
"%s: requested freq after conversion = %"PRIll" Hz\n", __func__,
(int64_t)from_bcd(p->p_cmd, 8) * 10);
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 97b7586e..d9d1fe3e 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -443,10 +443,8 @@ int ft817_init(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
- // cppcheck-suppress *
if ((rig->state.priv = calloc(1, sizeof(struct ft817_priv_data))) == NULL)
{
- // cppcheck-suppress *
return -RIG_ENOMEM;
}
@@ -455,7 +453,6 @@ int ft817_init(RIG *rig)
/* Copy complete native cmd set to private cmd storage area */
memcpy(priv->pcs, ncmd, sizeof(ncmd));
- // cppcheck-suppress *
return RIG_OK;
}
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 38811e46..aa084df3 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -298,10 +298,8 @@ int ft857_init(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__);
- // cppcheck-suppress *
if ((rig->state.priv = calloc(1, sizeof(struct ft857_priv_data))) == NULL)
{
- // cppcheck-suppress *
return -RIG_ENOMEM;
}
@@ -310,7 +308,6 @@ int ft857_init(RIG *rig)
/* Copy complete native cmd set to private cmd storage area */
memcpy(priv->pcs, ncmd, sizeof(ncmd));
- // cppcheck-suppress *
return RIG_OK;
}
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index beae23da..ff489c4f 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -334,10 +334,8 @@ int ft897_init(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
- // cppcheck-suppress *
if ((rig->state.priv = calloc(1, sizeof(struct ft897_priv_data))) == NULL)
{
- // cppcheck-suppress *
return -RIG_ENOMEM;
}
@@ -346,7 +344,6 @@ int ft897_init(RIG *rig)
/* Copy complete native cmd set to private cmd storage area */
memcpy(priv->pcs, ncmd, sizeof(ncmd));
- // cppcheck-suppress *
return RIG_OK;
}
diff --git a/src/microham.c b/src/microham.c
index 6d5a0953..49cc6ba9 100644
--- a/src/microham.c
+++ b/src/microham.c
@@ -251,7 +251,6 @@ static void close_microham()
#define NUMUHTYPES 9
static struct uhtypes
{
- // cppcheck-suppress *
const char *name;
const char *device;
} uhtypes[NUMUHTYPES] =
diff --git a/src/misc.c b/src/misc.c
index 564277d0..a8c81175 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -578,7 +578,6 @@ static struct
* utility function to convert index to bit value
*
*/
-// cppcheck-suppress *
uint64_t rig_idx2setting(int i)
{
return ((uint64_t)1) << i;
diff --git a/tests/ampctl.c b/tests/ampctl.c
index 1e7e9381..cbd8da64 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -49,7 +49,7 @@ extern char *readline();
#else
/* no readline */
#endif /* HAVE_LIBREADLINE */
-
+#warn here1
#ifdef HAVE_READLINE_HISTORY
# include <sys/stat.h>
# define HST_SHRT_OPTS "iI"
diff --git a/tests/ampctld.c b/tests/ampctld.c
index 440c2ce1..05f10ef2 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -599,7 +599,6 @@ int main(int argc, char *argv[])
#endif
}
- // cppcheck-suppress *
while (retcode == 0);
amp_close(my_amp); /* close port */
diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
index ef931405..95f5064a 100644
--- a/tests/rotctl_parse.c
+++ b/tests/rotctl_parse.c
@@ -298,7 +298,6 @@ int hash_model_id_sort(struct mod_lst *a, struct mod_lst *b)
void hash_sort_by_model_id()
{
- // cppcheck-suppress *
HASH_SORT(models, hash_model_id_sort);
}
diff --git a/tests/rotctld.c b/tests/rotctld.c
index c7bfa5e4..ab4e4d52 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -612,7 +612,6 @@ int main(int argc, char *argv[])
#endif
}
- // cppcheck-suppress *
while (retcode == 0);
rot_close(my_rot); /* close port */
diff --git a/tests/sprintflst.c b/tests/sprintflst.c
index d7e456f4..567805c7 100644
--- a/tests/sprintflst.c
+++ b/tests/sprintflst.c
@@ -70,7 +70,6 @@ int sprintf_vfo(char *str, vfo_t vfo)
int sprintf_mode(char *str, rmode_t mode)
{
- // cppcheck-suppress *
uint64_t i, len = 0;
*str = '\0';
@@ -82,7 +81,6 @@ int sprintf_mode(char *str, rmode_t mode)
for (i = 0; i < 63; i++)
{
- // cppcheck-suppress *
const char *ms = rig_strrmode(mode & (1ULL << i));
if (!ms || !ms[0])
@@ -148,7 +146,6 @@ int sprintf_ant(char *str, ant_t ant)
int sprintf_func(char *str, setting_t func)
{
- // cppcheck-suppress *
uint64_t i, len = 0;
*str = '\0';
diff --git a/tests/testfreq.c b/tests/testfreq.c
index b4632d1f..90ed5a4e 100644
--- a/tests/testfreq.c
+++ b/tests/testfreq.c
@@ -43,27 +43,22 @@ int main(int argc, char *argv[])
/* freq on 32bits test */
f = GHz(4);
- // cppcheck-suppress *
printf("GHz(4) = %"PRIll"\n", (int64_t)f);
/* freq on >32bits test */
f = GHz(5);
- // cppcheck-suppress *
printf("GHz(5) = %"PRIll"\n", (int64_t)f);
/* floating point to freq conversion test */
f = GHz(1.3);
- // cppcheck-suppress *
printf("GHz(1.3) = %"PRIll"\n", (int64_t)f);
/* floating point to freq conversion precision test */
f = GHz(1.234567890);
- // cppcheck-suppress *
printf("GHz(1.234567890) = %"PRIll"\n", (int64_t)f);
/* floating point to freq conversion precision test, with freq >32bits */
f = GHz(123.456789012);
- // cppcheck-suppress *
printf("GHz(123.456789012) = %"PRIll"\n", (int64_t)f);
return 0;
commit dd3b1b71d0e80598119f194686fedc460b2045fc
Author: Michael Black W9MDB <mdb...@ya...>
Date: Wed Sep 2 16:44:46 2020 -0500
Fix spelling of Funkamateur
diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c
index a971bf3b..57c416e1 100644
--- a/rigs/kit/si570avrusb.c
+++ b/rigs/kit/si570avrusb.c
@@ -476,7 +476,7 @@ const struct rig_caps fasdr_caps =
{
RIG_MODEL(RIG_MODEL_FASDR),
.model_name = "FA-SDR",
- .mfg_name = "Funkamatuer",
+ .mfg_name = "Funkamateur",
.version = BACKEND_VER ".0",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
-----------------------------------------------------------------------
Summary of changes:
dummy/dummy.c | 1 -
rigs/aor/aor.c | 1 -
rigs/icom/frame.c | 11 -----------
rigs/icom/icom.c | 12 +++++++++---
rigs/jrc/jrc.c | 1 -
rigs/kenwood/ts950.c | 4 ++--
rigs/kit/si570avrusb.c | 2 +-
rigs/prm80/prm80.c | 2 --
rigs/tentec/tt550.c | 4 ----
rigs/yaesu/ft1000mp.c | 1 -
rigs/yaesu/ft817.c | 3 ---
rigs/yaesu/ft857.c | 3 ---
rigs/yaesu/ft897.c | 3 ---
src/microham.c | 1 -
src/misc.c | 1 -
tests/ampctl.c | 1 -
tests/ampctld.c | 1 -
tests/rotctl_parse.c | 1 -
tests/rotctld.c | 1 -
tests/sprintflst.c | 3 ---
tests/testfreq.c | 5 -----
21 files changed, 12 insertions(+), 50 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
|
From: Michael B. <mdb...@us...> - 2020-09-02 04:27:21
|
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 a0ee4d01b2e16c01f56d7a2fa08fb456a23fc894 (commit)
from e459d4edc2bd7ff91e38974244b4a6e778cde119 (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 a0ee4d01b2e16c01f56d7a2fa08fb456a23fc894
Author: Michael Black W9MDB <mdb...@ya...>
Date: Tue Sep 1 23:26:35 2020 -0500
https://github.com/Hamlib/Hamlib/issues/359
Fix Yaesu command retries
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 3ef057aa..f3f1df76 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -355,7 +355,7 @@ transaction_read:
if (retval < 0)
{
rig_debug(RIG_DEBUG_WARN,
- "%s: read_string retval < 0, retval = %d, retry_read=%d, retry=%d\n", __func__,
+ "%s: read_string retval < 0, retval = %d, retry_read=%d, rs->rigport.retry=%d\n", __func__,
retval, retry_read, rs->rigport.retry);
// only retry if we expect a response from the command
@@ -476,7 +476,8 @@ transaction_read:
rig_debug(RIG_DEBUG_ERR, "%s: wrong reply %c%c for command %c%c\n",
__func__, buffer[0], buffer[1], cmdstr[0], cmdstr[1]);
- if (retry_read++ < rs->rigport.retry)
+ rig_debug(RIG_DEBUG_ERR, "%s: retry_read=%d, rs->rigport.retry=%d\n", __func__, retry_read, rs->rigport.retry);
+ if (retry_read++ < rs->rigport.retry)
{
goto transaction_write;
}
@@ -4220,6 +4221,8 @@ DECLARE_PROBERIG_BACKEND(kenwood)
int retval = -1;
int rates[] = { 115200, 57600, 38400, 19200, 9600, 4800, 1200, 0 }; /* possible baud rates */
int rates_idx;
+ int write_delay = port->write_delay;
+ int retry = port->retry;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -4249,6 +4252,8 @@ DECLARE_PROBERIG_BACKEND(kenwood)
if (retval != RIG_OK)
{
+ port->write_delay = write_delay;
+ port->retry = retry;
return RIG_MODEL_NONE;
}
@@ -4264,6 +4269,8 @@ DECLARE_PROBERIG_BACKEND(kenwood)
if (retval != RIG_OK || id_len < 0 || !strcmp(idbuf, "ID;"))
{
+ port->write_delay = write_delay;
+ port->retry = retry;
return RIG_MODEL_NONE;
}
@@ -4276,6 +4283,8 @@ DECLARE_PROBERIG_BACKEND(kenwood)
rig_debug(RIG_DEBUG_VERBOSE, "probe_kenwood: protocol error, "
" expected %d, received %d: %s\n",
6, id_len, idbuf);
+ port->write_delay = write_delay;
+ port->retry = retry;
return RIG_MODEL_NONE;
}
@@ -4293,6 +4302,8 @@ DECLARE_PROBERIG_BACKEND(kenwood)
(*cfunc)(port, kenwood_id_string_list[i].model, data);
}
+ port->write_delay = write_delay;
+ port->retry = retry;
return kenwood_id_string_list[i].model;
}
}
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index 879e2cd4..e6497802 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -27,7 +27,7 @@
#include <string.h>
#include "token.h"
-#define BACKEND_VER "20200714"
+#define BACKEND_VER "20200901"
#define EOM_KEN ';'
#define EOM_TH '\r'
-----------------------------------------------------------------------
Summary of changes:
rigs/kenwood/kenwood.c | 15 +++++++++++++--
rigs/kenwood/kenwood.h | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
4 messages has been excluded from this view by a project administrator.
