[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 41f5e8d24abca6b4bde67
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 41f5e8d24abca6b4bde67817bc73a367bb406256
|
From: Michael B. <mdb...@us...> - 2020-12-27 22:38:22
|
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 41f5e8d24abca6b4bde67817bc73a367bb406256 (commit)
via 82958c957c0add447ab7355e0f520211a4ef68b7 (commit)
via a53f494582afd837d439fe9ad767663a5920b478 (commit)
via d0c8cff98634df834d507e2fa8b19d6325a5c69e (commit)
via 5f73977ec0cbf3e8623d76dfa284f27d4a82412e (commit)
from a714899cb0040ff0bb906b140171f81dce144888 (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 41f5e8d24abca6b4bde67817bc73a367bb406256
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Dec 27 15:33:21 2020 -0600
Add RIG_MODE_SPEC to misc.c
diff --git a/src/misc.c b/src/misc.c
index 40b0f6df..fa023d5b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -391,6 +391,7 @@ static struct
{ RIG_MODE_PSK, "PSK"},
{ RIG_MODE_PSKR, "PSKR"},
{ RIG_MODE_C4FM, "C4FM"},
+ { RIG_MODE_SPEC, "SPEC"},
{ RIG_MODE_NONE, "" },
};
commit 82958c957c0add447ab7355e0f520211a4ef68b7
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Dec 27 14:53:39 2020 -0600
Add RIG_MODE_SPEC for PowerSDR and perhaps others to come
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 8825c8d6..3650026e 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -1153,7 +1153,7 @@ typedef uint64_t rmode_t;
#define RIG_MODE_DD CONSTANT_64BIT_FLAG (32) /*!< \c DD Mode IC-9700 */
#define RIG_MODE_C4FM CONSTANT_64BIT_FLAG (33) /*!< \c Yaesu C4FM mode */
#define RIG_MODE_PKTFMN CONSTANT_64BIT_FLAG (34) /*!< \c Yaesu DATA-FM-N */
-#define RIG_MODE_BIT35 CONSTANT_64BIT_FLAG (35) /*!< \c reserved for future expansion */
+#define RIG_MODE_SPEC CONSTANT_64BIT_FLAG (35) /*!< \c Unfiltered as in PowerSDR */
#define RIG_MODE_BIT36 CONSTANT_64BIT_FLAG (36) /*!< \c reserved for future expansion */
#define RIG_MODE_BIT37 CONSTANT_64BIT_FLAG (37) /*!< \c reserved for future expansion */
#define RIG_MODE_BIT38 CONSTANT_64BIT_FLAG (38) /*!< \c reserved for future expansion */
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index bb6bb9be..4f7f0239 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -908,7 +908,8 @@ static int flrig_open(RIG *rig)
else if (streq(p, "WFM")) { modeMapAdd(&modes, RIG_MODE_WFM, p); }
else if (streq(p, "UCW")) { modeMapAdd(&modes, RIG_MODE_CW, p); }
else if (streq(p, "C4FM")) { modeMapAdd(&modes, RIG_MODE_C4FM, p); }
- else if (streq(p, "SPEC") || streq(p,"DRM"))
+ else if (streq(p, "SPEC")) { modeMapAdd(&modes, RIG_MODE_SPEC, p); }
+ else if (streq(p,"DRM")) // we don't support DRM yet (or maybe ever)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: no mapping for mode %s\n", __func__, p);
}
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index 9e017c2c..0f5a7fa4 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20201226"
+#define BACKEND_VER "20201227"
#define EOM "\r"
#define TRUE 1
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 492d5205..83c2249f 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -49,6 +49,8 @@
#define F6K_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3)
/* PowerSDR differences */
+#define POWERSDR_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_SPEC)
+
#define POWERSDR_FUNC_ALL (RIG_FUNC_VOX|RIG_FUNC_SQL|RIG_FUNC_NB|RIG_FUNC_ANF|RIG_FUNC_MUTE|RIG_FUNC_RIT|RIG_FUNC_XIT|RIG_FUNC_TUNER)
#define POWERSDR_LEVEL_ALL (RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW|RIG_LEVEL_KEYSPD|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|RIG_LEVEL_MICGAIN|RIG_LEVEL_VOXGAIN|RIG_LEVEL_SQL|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_RF|RIG_LEVEL_IF)
@@ -1206,31 +1208,31 @@ const struct rig_caps powersdr_caps =
.chan_list = { RIG_CHAN_END },
.rx_range_list1 = {
- {kHz(30), MHz(77), F6K_MODES, -1, -1, F6K_VFO, F6K_ANTS},
- {MHz(135), MHz(165), F6K_MODES, -1, - 1, F6K_VFO, F6K_ANTS},
+ {kHz(30), MHz(77), POWERSDR_MODES, -1, -1, F6K_VFO, F6K_ANTS},
+ {MHz(135), MHz(165), POWERSDR_MODES, -1, - 1, F6K_VFO, F6K_ANTS},
RIG_FRNG_END,
}, /* rx range */
.tx_range_list1 = {
- FRQ_RNG_HF(1, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
- FRQ_RNG_6m(1, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
- FRQ_RNG_2m(1, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_HF(1, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_6m(1, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_2m(1, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
RIG_FRNG_END,
}, /* tx range */
.rx_range_list2 = {
- {kHz(30), MHz(77), F6K_MODES, -1, -1, F6K_VFO, F6K_ANTS},
- { MHz(135), MHz(165), F6K_MODES, -1, -1, F6K_VFO, F6K_ANTS},
+ {kHz(30), MHz(77), POWERSDR_MODES, -1, -1, F6K_VFO, F6K_ANTS},
+ { MHz(135), MHz(165), POWERSDR_MODES, -1, -1, F6K_VFO, F6K_ANTS},
RIG_FRNG_END,
}, /* rx range */
.tx_range_list2 = {
- FRQ_RNG_HF(2, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
- FRQ_RNG_6m(2, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
- FRQ_RNG_2m(2, F6K_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_HF(2, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_6m(2, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
+ FRQ_RNG_2m(2, POWERSDR_MODES, mW(10), W(100), F6K_VFO, F6K_ANTS),
RIG_FRNG_END,
}, /* tx range */
.tuning_steps = {
- {F6K_MODES, 1},
+ {POWERSDR_MODES, 1},
RIG_TS_END,
},
commit a53f494582afd837d439fe9ad767663a5920b478
Merge: 5f73977e d0c8cff9
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Dec 27 13:01:27 2020 -0600
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit d0c8cff98634df834d507e2fa8b19d6325a5c69e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Dec 27 18:57:01 2020 +0000
Fix cygwin compilation for g313-winradio
https://github.com/Hamlib/Hamlib/issues/479
diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c
index 8bbc3328..abc99cf3 100644
--- a/rigs/winradio/g313-win.c
+++ b/rigs/winradio/g313-win.c
@@ -27,7 +27,7 @@
#define G313_MODES (RIG_MODE_NONE)
-#ifdef _WIN32
+#if defined (_WIN32) || !defined(OTHER_POSIX)
#ifdef HAVE_WINDOWS_H
#include <windows.h>
commit 5f73977ec0cbf3e8623d76dfa284f27d4a82412e
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Dec 27 12:44:14 2020 -0600
fix cygwin compile warning on rotorex.c
diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c
index 36d684c3..e3c87472 100644
--- a/rotators/rotorez/rotorez.c
+++ b/rotators/rotorez/rotorez.c
@@ -764,7 +764,7 @@ static int rt21_rot_get_position(ROT *rot, azimuth_t *azimuth,
* Seems as though at least five characters are returned and a
* space is used as a leading pad character if needed.
*/
- if ((isdigit(az[0])) || (isspace(az[0])))
+ if ((isdigit((int)az[0])) || (isspace((int)az[0])))
{
azimuth_t tmp = strtof(az, NULL);
rig_debug(RIG_DEBUG_TRACE, "%s: \"%s\" after conversion = %.1f\n",
-----------------------------------------------------------------------
Summary of changes:
include/hamlib/rig.h | 2 +-
rigs/dummy/flrig.c | 3 ++-
rigs/dummy/flrig.h | 2 +-
rigs/kenwood/flex6xxx.c | 24 +++++++++++++-----------
rigs/winradio/g313-win.c | 2 +-
rotators/rotorez/rotorez.c | 2 +-
src/misc.c | 1 +
7 files changed, 20 insertions(+), 16 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
