kopia lustrzana https://github.com/Hamlib/Hamlib
Update frequency ranges for ic9100 and ft991 using new tagged ranges
ic9100 now has 5 ranges and ft991 just 1 We will need to update all rigs to this new format All rigs should be converted to hardware-based freq ranges allowing for non-region based radios This will probably mean getting rid of REGION macros and suchpull/224/head
Michael Black
rodzic
1371e200e1
commit
3c1f0a870c
|
|
@ -470,35 +470,89 @@ const struct rig_caps ic9700_caps =
|
|||
|
||||
// Hopefully any future changes in bandplans can be fixed with firmware updates
|
||||
// So we use the global REGION2 macros in here
|
||||
.rx_range_list1 = { // EUR Version
|
||||
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
{MHz(430), MHz(440), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
.rx_range_list1 = { // USA Version
|
||||
{MHz(144), MHz(148), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(430), MHz(450), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
.tx_range_list1 = {
|
||||
FRQ_RNG_2m_REGION1(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_70cm_REGION1(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_23cm_REGION1(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_2m_REGION1(RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_70cm_REGION1(RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_23cm_REGION1(RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR),
|
||||
.tx_range_list1 = {
|
||||
{MHz(144),MHz(148),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(430),MHz(450),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(1240),MHz(1300),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(144),MHz(148),RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(430),MHz(450),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
{MHz(1240),MHz(1300),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "USA"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
.rx_range_list2 = { // USA Version
|
||||
{MHz(144), MHz(148), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
{MHz(430), MHz(450), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR},
|
||||
.rx_range_list2 = { // EUR Version
|
||||
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(430), MHz(440), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
.tx_range_list2 = {
|
||||
FRQ_RNG_2m_REGION2(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_70cm_REGION2(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_23cm_REGION2(IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_2m_REGION2(RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_70cm_REGION2(RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR),
|
||||
FRQ_RNG_23cm_REGION2(RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR),
|
||||
.tx_range_list2 = {
|
||||
{MHz(144),MHz(146),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(430),MHz(440),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(1240),MHz(1300),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(144),MHz(146),RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(430),MHz(440),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
{MHz(1240),MHz(1300),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "EUR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
.rx_range_list3 = { // ITR Version
|
||||
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(430), MHz(434), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(435), MHz(438), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1240), MHz(1245), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1270), MHz(1298), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
.tx_range_list3 = {
|
||||
{MHz(144),MHz(146),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(430),MHz(434),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(435),MHz(438),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1240),MHz(1245),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1270),MHz(1298),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(144),MHz(146),RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(430),MHz(434),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(435),MHz(438),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1240),MHz(1245),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
{MHz(1270),MHz(1298),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "ITR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
.rx_range_list4 = { // TPE Version
|
||||
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(430), MHz(432), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(1260), MHz(1265), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
.tx_range_list4 = {
|
||||
{MHz(144),MHz(146),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(430),MHz(432),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(1260),MHz(1265),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(144),MHz(146),RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(430),MHz(432),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
{MHz(1260),MHz(1265),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "TPE"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
.rx_range_list5 = { // KOR Version
|
||||
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(430), MHz(440), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(1260), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
.tx_range_list5 = {
|
||||
{MHz(144),MHz(146),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(100), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(430),MHz(440),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.5), W(75), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(1260),MHz(1300),IC9700_ALL_TX_MODES^RIG_MODE_AM, W(0.1), W(10), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(144),MHz(146),RIG_MODE_AM, W(0.125), W(25), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(430),MHz(440),RIG_MODE_AM, W(0.125), W(18.75), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
{MHz(1260),MHz(1300),RIG_MODE_AM, W(0.025), W(2.5), IC9700_VFOS, RIG_ANT_CURR, "KOR"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const struct rig_caps ft991_caps =
|
|||
.rig_model = RIG_MODEL_FT991,
|
||||
.model_name = "FT-991",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".8",
|
||||
.version = NEWCAT_VER ".9",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
|
@ -101,38 +101,21 @@ const struct rig_caps ft991_caps =
|
|||
RIG_CHAN_END,
|
||||
},
|
||||
|
||||
.rx_range_list1 = { // the operating range of the rig
|
||||
{kHz(30), MHz(56), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(118), MHz(164), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(420), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
// Rig only has 1 model
|
||||
.rx_range_list1 = {
|
||||
{kHz(30), MHz(56), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
{MHz(118), MHz(164), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
{MHz(420), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
},
|
||||
|
||||
.tx_range_list1 = {
|
||||
{MHz(1.8), MHz(54),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(1.8), MHz(54),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
{MHz(144), MHz(148),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(144), MHz(148),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
{MHz(430), MHz(450),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(430), MHz(450),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
// Region 2 can go up to 480 but the rig as of 2017 Manual only goes to 470
|
||||
.rx_range_list2 = {
|
||||
{kHz(30), MHz(56), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(118), MHz(164), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(420), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
.tx_range_list2 = {
|
||||
{MHz(1.8), MHz(54),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(1.8), MHz(54),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
{MHz(144), MHz(148),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(144), MHz(148),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
{MHz(430), MHz(450),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
|
||||
{MHz(430), MHz(450),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
|
||||
{MHz(1.8), MHz(54),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
{MHz(1.8), MHz(54),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS,"Operating"}, /* AM class */
|
||||
{MHz(144), MHz(148),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
{MHz(144), MHz(148),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS,"Operating"}, /* AM class */
|
||||
{MHz(430), MHz(450),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS,"Operating"},
|
||||
{MHz(430), MHz(450),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS,"Operating"}, /* AM class */
|
||||
RIG_FRNG_END,
|
||||
},
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue