[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. v4.0rc1-50-gf133483d
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-50-gf133483d
|
From: Michael B. <mdb...@us...> - 2020-07-23 14:00:44
|
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 f133483dd8d6946e185bb00b1c0d1c8cbefbed5b (commit)
via 10f7f8da70311f1fcfc4434b51a5c1c66d18cd7b (commit)
via 956b29a0aa4eba8eed43b086fb5cb4c548e29407 (commit)
from 038b87b29913b5264c00eafaf06a3cc13dc16db7 (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 f133483dd8d6946e185bb00b1c0d1c8cbefbed5b
Merge: 10f7f8da 956b29a0
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jul 23 09:00:16 2020 -0500
Add 4m EUR to FTDX101D
commit 10f7f8da70311f1fcfc4434b51a5c1c66d18cd7b
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jul 23 08:57:58 2020 -0500
Add 4m EUR to FTDX101D
diff --git a/include/bandplan.h b/include/bandplan.h
index 4b43271d..c70dca9e 100644
--- a/include/bandplan.h
+++ b/include/bandplan.h
@@ -141,6 +141,9 @@
#define FRQ_RNG_6m_REGION2(md,lp,hp,v,a) \
{ MHz(50),MHz(54), (md), (lp), (hp), (v), (a), "ITU2" }
+#define FRQ_RNG_4m_REGION2(md,lp,hp,v,a) \
+ { MHz(70),MHz(70.5), (md), (lp), (hp), (v), (a), "ITU2" }
+
#define FRQ_RNG_2m_REGION2(md,lp,hp,v,a) \
{ MHz(144),MHz(148), (md), (lp), (hp), (v), (a), "ITU2" }
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index 8c9dc135..8ccef479 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -99,29 +99,29 @@ const struct rig_caps ftdx5000_caps =
.rx_range_list1 = {
/* General coverage + ham, ANT_5 is RX only antenna */
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "USA"},
RIG_FRNG_END,
},
.tx_range_list1 = {
FRQ_RNG_HF(1, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
FRQ_RNG_HF(1, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
- FRQ_RNG_6m(1, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
- FRQ_RNG_6m(1, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
+ FRQ_RNG_6m_REGION1(FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
+ FRQ_RNG_6m_REGION1(FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
.rx_range_list2 = {
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "EUR"},
RIG_FRNG_END,
},
.tx_range_list2 = {
FRQ_RNG_HF(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
FRQ_RNG_HF(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
- FRQ_RNG_6m(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
- FRQ_RNG_6m(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
+ FRQ_RNG_6m_REGION2(FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
+ FRQ_RNG_6m_REGION2(FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
@@ -271,7 +271,7 @@ const struct rig_caps ftdx3000_caps =
.rx_range_list1 = {
/* General coverage + ham, ANT_5 is RX only antenna */
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "USA"},
RIG_FRNG_END,
},
@@ -285,7 +285,7 @@ const struct rig_caps ftdx3000_caps =
},
.rx_range_list2 = {
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "EUR"},
RIG_FRNG_END,
},
@@ -388,7 +388,7 @@ const struct rig_caps ftdx101d_caps =
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".0",
.copyright = "LGPL",
- .status = RIG_STATUS_BETA,
+ .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_NONE,
@@ -434,7 +434,7 @@ const struct rig_caps ftdx101d_caps =
.rx_range_list1 = {
/* General coverage + ham, ANT_5 is RX only antenna */
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "USA"},
RIG_FRNG_END,
},
@@ -448,7 +448,7 @@ const struct rig_caps ftdx101d_caps =
},
.rx_range_list2 = {
- {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5},
+ {kHz(30), MHz(60), FTDX5000_ALL_RX_MODES, -1, -1, FTDX5000_VFO_ALL, FTDX5000_TX_ANTS | RIG_ANT_5, "EUR"},
RIG_FRNG_END,
},
@@ -457,6 +457,8 @@ const struct rig_caps ftdx101d_caps =
FRQ_RNG_HF(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
FRQ_RNG_6m(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
FRQ_RNG_6m(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
+ FRQ_RNG_4m_REGION2(FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
+ FRQ_RNG_4m_REGION2(FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
commit 956b29a0aa4eba8eed43b086fb5cb4c548e29407
Author: Michael Black W9MDB <mdb...@ya...>
Date: Thu Jul 23 08:24:03 2020 -0500
Add 4m to FTDX101D and promote to stable
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index 8c9dc135..180d962d 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -388,7 +388,7 @@ const struct rig_caps ftdx101d_caps =
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".0",
.copyright = "LGPL",
- .status = RIG_STATUS_BETA,
+ .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_NONE,
@@ -457,6 +457,8 @@ const struct rig_caps ftdx101d_caps =
FRQ_RNG_HF(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
FRQ_RNG_6m(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
FRQ_RNG_6m(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
+ FRQ_RNG_4m(2, FTDX5000_OTHER_TX_MODES, W(5), W(200), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS),
+ FRQ_RNG_4m(2, FTDX5000_AM_TX_MODES, W(2), W(75), FTDX5000_VFO_ALL, FTDX5000_TX_ANTS), /* AM class */
RIG_FRNG_END,
},
-----------------------------------------------------------------------
Summary of changes:
include/bandplan.h | 3 +++
rigs/yaesu/ft5000.c | 24 +++++++++++++-----------
2 files changed, 16 insertions(+), 11 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
