[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-38-g664cfaa0
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-38-g664cfaa0
|
From: Michael B. <mdb...@us...> - 2020-07-17 12:50: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 664cfaa0c6423c8dd1e92a4485766775458ab3e2 (commit)
via 40b5a0f37fdb64edb33abe0f27d469f806295ae2 (commit)
via c708513d081922017772e8c9fbcad93b270e9696 (commit)
via 31c7441338b26c30b2186813ae661897b780fe83 (commit)
via d0bff25bb9ac7fb02c524e144c5ebe2e0e8b1b1a (commit)
via a00a4b3623b362dafa83f60567b8f2e8fbcc1594 (commit)
via d36c5c5179698ede729836eb8d0502a6df4f53a3 (commit)
via fbc9f3508f070924ff38353f177456466f141c6a (commit)
via 705dff4be6a729f94b3ad1792776a774c4dacbde (commit)
via d05dc06e6edffaedfdd1b0de76b640fae8d5ea17 (commit)
via f91deb5b99544c2e8d10bc7ee72c3e698a670e1b (commit)
via 89cc374620753a21f37c6d4931d5509105ddf79c (commit)
via 3fbde2f7cabec92daef071d156b17f5649921782 (commit)
via 5e75d4fb48f0a60a3896a4a656451010eab0aaa1 (commit)
via cd0c0402cd27afd4d90e88d4dfd40f3cead44f5a (commit)
via 3e0b1e2eed1e655eb31fc5ec6362d8e62de12304 (commit)
via 95717720150115835a4c8dc50125a17885fbf85e (commit)
via ccc981e51e94b31ca034a2700fabc9cb6fa90167 (commit)
via 7691c1e84fec43aace8d9dfb62781c5c2e82d9bd (commit)
via 3d20314681c430e5f17638dadcaaa6dfc078c6d5 (commit)
via 6e792e8a8cd7cbc08774debe47eec31e039feafe (commit)
via 993e9b392b679c7ced928809a5924b5449b901d8 (commit)
via 1fd4e9434bba4e23797ef608040d7862ff6667e2 (commit)
from 7b3527187c7c195b37c9c9b991559f5a2663e7dc (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 664cfaa0c6423c8dd1e92a4485766775458ab3e2
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 17 07:50:24 2020 -0500
Another promotion to STABLE
diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c
index 3077ef26..1402471f 100644
--- a/rigs/kit/funcube.c
+++ b/rigs/kit/funcube.c
@@ -105,7 +105,7 @@ const struct rig_caps funcube_caps =
.mfg_name = "AMSAT-UK",
.version = BACKEND_VER ".0",
.copyright = "LGPL",
- .status = RIG_STATUS_BETA,
+ .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TUNER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_NONE,
@@ -168,7 +168,7 @@ const struct rig_caps funcubeplus_caps =
.mfg_name = "AMSAT-UK",
.version = BACKEND_VER ".0",
.copyright = "LGPL",
- .status = RIG_STATUS_BETA,
+ .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TUNER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_NONE,
commit 40b5a0f37fdb64edb33abe0f27d469f806295ae2
Merge: 7b352718 c708513d
Author: Michael Black <mdb...@ya...>
Date: Fri Jul 17 06:30:36 2020 -0500
Merge pull request #345 from dl1ycf/master
Corrections. Mostly to make the Compiler happy, but also a serious one.
commit c708513d081922017772e8c9fbcad93b270e9696
Author: c vw <dl...@da...>
Date: Fri Jul 17 12:25:02 2020 +0200
corr
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 1c85a224..a2c6fc86 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1710,7 +1710,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (priv->has_rit2) // if backend shows it has the Set 2 command
{
- char cmd[15];
+ char cmd[15]; // length required to make Apple-gcc happy (unicode-proof).
snprintf(cmd, sizeof(cmd)-1, "R%c%05d", rit > 0 ? 'U' : 'D', abs((int)rit));
retval = kenwood_transaction(rig, cmd, NULL, 0);
}
commit 31c7441338b26c30b2186813ae661897b780fe83
Author: c vw <dl...@da...>
Date: Fri Jul 17 12:23:26 2020 +0200
corr.
diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c
index d3159d91..0fc86fa0 100644
--- a/rigs/drake/drake.c
+++ b/rigs/drake/drake.c
@@ -853,7 +853,7 @@ int drake_get_chan(RIG *rig, channel_t *chan, int read_only)
strncpy(chan->channel_desc, mdbuf + 25, 7);
- chan->channel_desc[8]='\0'; // in case strncpy did not terminate the string
+ chan->channel_desc[7]='\0'; // in case strncpy did not terminate the string
//now put the radio back the way it was
//we apparently can't do a read-only channel read
commit d0bff25bb9ac7fb02c524e144c5ebe2e0e8b1b1a
Author: c vw <dl...@da...>
Date: Fri Jul 17 12:22:21 2020 +0200
Corrections
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index ceda53d4..e4d5a56f 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -471,6 +471,7 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
return -RIG_EINVAL;
}
+ filter=0; // avoid compiler warings of being possibly uninitialized
retval = dxsr8_read_num(rig, AL "~RR_NAR" EOM, &filter);
if (filter == 0)
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 38430d36..61c3cd25 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -467,6 +467,7 @@ int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (retval != RIG_OK) { return retval; }
strncpy(mdbuf2, mdbuf + 4, 3); /* Extract first 'BW' part */
+ mdbuf2[3]='\0'; // in case strnpy produces and un-terminated string
mdbuf2_len = strlen(mdbuf2);
retval = aor_transaction(rig, mdbuf2, mdbuf2_len, NULL, NULL);
diff --git a/rigs/drake/drake.c b/rigs/drake/drake.c
index 06687252..d3159d91 100644
--- a/rigs/drake/drake.c
+++ b/rigs/drake/drake.c
@@ -563,6 +563,7 @@ int drake_set_mem(RIG *rig, vfo_t vfo, int ch)
len = sprintf(buf, "C%03d" EOM, ch);
+ ack_len=0; // fix compile-time warning "possibly uninitialized"
retval = drake_transaction(rig, buf, len, ackbuf, &ack_len);
if (ack_len != 2)
@@ -852,6 +853,7 @@ int drake_get_chan(RIG *rig, channel_t *chan, int read_only)
strncpy(chan->channel_desc, mdbuf + 25, 7);
+ chan->channel_desc[8]='\0'; // in case strncpy did not terminate the string
//now put the radio back the way it was
//we apparently can't do a read-only channel read
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 196826e5..1c85a224 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -1661,7 +1661,7 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
{
int retval;
- char buf[6];
+ char buf[7];
struct kenwood_priv_data *priv = rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -1710,8 +1710,8 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (priv->has_rit2) // if backend shows it has the Set 2 command
{
- char cmd[10];
- snprintf(cmd, sizeof(cmd) - 1, "R%c%05d", rit > 0 ? 'U' : 'D', abs((int)rit));
+ char cmd[15];
+ snprintf(cmd, sizeof(cmd)-1, "R%c%05d", rit > 0 ? 'U' : 'D', abs((int)rit));
retval = kenwood_transaction(rig, cmd, NULL, 0);
}
else
diff --git a/src/rig.c b/src/rig.c
index 274d1a65..be6dcefd 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -182,8 +182,7 @@ static const char *rigerror_table[] =
"Communication bus collision",
"NULL RIG handle or invalid pointer parameter",
"Invalid VFO",
- "Argument out of domain of func",
- NULL,
+ "Argument out of domain of func"
};
@@ -294,7 +293,8 @@ const char *HAMLIB_API rigerror(int errnum)
if (errnum >= ERROR_TBL_SZ)
{
- return NULL;
+ // This should not happen, but if it happens don't return NULL
+ return "ERR_OUT_OF_RANGE";
}
return rigerror_table[errnum];
commit a00a4b3623b362dafa83f60567b8f2e8fbcc1594
Merge: d36c5c51 ec24abb6
Author: c vw <dl...@da...>
Date: Fri Jul 17 11:01:29 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit d36c5c5179698ede729836eb8d0502a6df4f53a3
Merge: fbc9f350 416380ec
Author: c vw <dl...@da...>
Date: Thu Jul 16 16:52:48 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit fbc9f3508f070924ff38353f177456466f141c6a
Merge: 705dff4b 9c856168
Author: c vw <dl...@da...>
Date: Fri Jul 10 13:58:39 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 705dff4be6a729f94b3ad1792776a774c4dacbde
Merge: d05dc06e 0c2b39c2
Author: c vw <dl...@da...>
Date: Fri Jul 3 16:16:54 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit d05dc06e6edffaedfdd1b0de76b640fae8d5ea17
Merge: f91deb5b bda6d1d1
Author: c vw <dl...@da...>
Date: Thu Jul 2 16:26:46 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit f91deb5b99544c2e8d10bc7ee72c3e698a670e1b
Merge: 89cc3746 c332036e
Author: c vw <dl...@da...>
Date: Mon Jun 29 15:46:40 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 89cc374620753a21f37c6d4931d5509105ddf79c
Merge: 3fbde2f7 0ac0d491
Author: DL1YCF <dl...@da...>
Date: Fri Jun 26 23:35:04 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 3fbde2f7cabec92daef071d156b17f5649921782
Merge: 5e75d4fb 0ec3d475
Author: c vw <dl...@da...>
Date: Fri Jun 19 15:57:38 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 5e75d4fb48f0a60a3896a4a656451010eab0aaa1
Merge: cd0c0402 95e869d0
Author: c vw <dl...@da...>
Date: Thu Jun 18 18:02:20 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit cd0c0402cd27afd4d90e88d4dfd40f3cead44f5a
Merge: 3e0b1e2e c0a3450f
Author: DL1YCF <dl...@da...>
Date: Sun Jun 14 14:24:52 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 3e0b1e2eed1e655eb31fc5ec6362d8e62de12304
Merge: 95717720 a11cddfd
Author: DL1YCF <dl...@da...>
Date: Sat Jun 13 15:38:30 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 95717720150115835a4c8dc50125a17885fbf85e
Merge: ccc981e5 2db0da54
Author: DL1YCF <dl...@da...>
Date: Sat Jun 13 10:44:28 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit ccc981e51e94b31ca034a2700fabc9cb6fa90167
Merge: 7691c1e8 b15c73d2
Author: DL1YCF <dl...@da...>
Date: Fri Jun 12 23:39:47 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 7691c1e84fec43aace8d9dfb62781c5c2e82d9bd
Merge: 3d203146 1317bb80
Author: c vw <dl...@da...>
Date: Fri Jun 12 15:49:31 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 3d20314681c430e5f17638dadcaaa6dfc078c6d5
Merge: 6e792e8a 7cdaa0ef
Author: c vw <dl...@da...>
Date: Fri Jun 12 15:06:20 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 6e792e8a8cd7cbc08774debe47eec31e039feafe
Author: c vw <dl...@da...>
Date: Fri Jun 12 10:45:43 2020 +0200
manual merge
diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c
index b65977e1..a7a3cebe 100644
--- a/rigs/kenwood/pihpsdr.c
+++ b/rigs/kenwood/pihpsdr.c
@@ -117,7 +117,7 @@ const struct rig_caps pihpsdr_caps =
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 50, /* ms */
- .timeout = 500,
+ .timeout = 500,
.retry = 1,
.has_get_func = PIHPSDR_FUNC_ALL,
.has_set_func = PIHPSDR_FUNC_ALL,
commit 993e9b392b679c7ced928809a5924b5449b901d8
Merge: 1fd4e943 c1b9f254
Author: c vw <dl...@da...>
Date: Fri Jun 12 10:41:58 2020 +0200
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 1fd4e9434bba4e23797ef608040d7862ff6667e2
Author: c vw <dl...@da...>
Date: Thu Jun 11 17:10:06 2020 +0200
Increased timeout, necessary because of changes in pihpsdr software
diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c
index c308301a..b65977e1 100644
--- a/rigs/kenwood/pihpsdr.c
+++ b/rigs/kenwood/pihpsdr.c
@@ -117,7 +117,7 @@ const struct rig_caps pihpsdr_caps =
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 50, /* ms */
- .timeout = 50,
+ .timeout = 500,
.retry = 1,
.has_get_func = PIHPSDR_FUNC_ALL,
.has_set_func = PIHPSDR_FUNC_ALL,
-----------------------------------------------------------------------
Summary of changes:
rigs/alinco/dxsr8.c | 1 +
rigs/aor/aor.c | 1 +
rigs/drake/drake.c | 2 ++
rigs/kenwood/kenwood.c | 6 +++---
rigs/kit/funcube.c | 4 ++--
src/rig.c | 6 +++---
6 files changed, 12 insertions(+), 8 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
