From 10f7f8da70311f1fcfc4434b51a5c1c66d18cd7b Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 23 Jul 2020 08:57:58 -0500 Subject: [PATCH] Add 4m EUR to FTDX101D --- include/bandplan.h | 3 +++ rigs/yaesu/ft5000.c | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/bandplan.h b/include/bandplan.h index 4b43271d2..c70dca9ee 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 8c9dc135e..8ccef4799 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, },