mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix range_list in ft991 

Add explanation of RIG_ANT_CURR for channel.ant entry.  It's to be used when rigs have multiple antenna ports for dedicated band ranges and the rig does not have a set_ant command
pull/224/head
Michael Black 2020-02-12 15:00:10 -06:00
rodzic a85160b1b9
commit 2161667428
3 zmienionych plików z 25 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
include/hamlib/rig.h
Wyświetl plik

@ -1038,7 +1038,7 @@ typedef struct freq_range_list {
int low_power; /*!< Lower RF power in mW, -1 for no power (ie. rx list) */ int low_power; /*!< Lower RF power in mW, -1 for no power (ie. rx list) */
int high_power; /*!< Higher RF power in mW, -1 for no power (ie. rx list) */ int high_power; /*!< Higher RF power in mW, -1 for no power (ie. rx list) */
vfo_t vfo; /*!< VFO list equipped with this range */ vfo_t vfo; /*!< VFO list equipped with this range */
ant_t ant; /*!< Antenna list equipped with this range, 0 means all, RIG_ANT_CURR means dedicated to certain bands and automatically switches */ ant_t ant; /*!< Antenna list equipped with this range, 0 means all, RIG_ANT_CURR means dedicated to certain bands and automatically switches, no set_ant command */
} freq_range_t; } freq_range_t;
#define RIG_FRNG_END {Hz(0),Hz(0),RIG_MODE_NONE,0,0,RIG_VFO_NONE} #define RIG_FRNG_END {Hz(0),Hz(0),RIG_MODE_NONE,0,0,RIG_VFO_NONE}

43
rigs/yaesu/ft991.c
Wyświetl plik

@ -55,7 +55,7 @@ const struct rig_caps ft991_caps =
.rig_model = RIG_MODEL_FT991, .rig_model = RIG_MODEL_FT991,
.model_name = "FT-991", .model_name = "FT-991",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = NEWCAT_VER ".6", .version = NEWCAT_VER ".8",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -101,31 +101,38 @@ const struct rig_caps ft991_caps =
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { .rx_range_list1 = { // the operating range of the rig
{kHz(30), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS}, /* General coverage + ham */ {kHz(30), MHz(56), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
RIG_FRNG_END, {MHz(118), MHz(164), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
}, /* FIXME: Are these the correct Region 1 values? */ {MHz(420), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS},
.tx_range_list1 = {
FRQ_RNG_HF(1, FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS),
FRQ_RNG_HF(1, FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS), /* AM class */
FRQ_RNG_6m(1, FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS),
FRQ_RNG_6m(1, FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS), /* AM class */
RIG_FRNG_END, 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 = { .rx_range_list2 = {
{kHz(30), MHz(470), FT991_ALL_RX_MODES, -1, -1, FT991_VFO_ALL, FT991_ANTS}, {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, RIG_FRNG_END,
}, },
.tx_range_list2 = { .tx_range_list2 = {
FRQ_RNG_HF(2, FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS), {MHz(1.8), MHz(54),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
FRQ_RNG_HF(2, FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS), /* AM class */ {MHz(1.8), MHz(54),FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS}, /* AM class */
FRQ_RNG_6m(2, FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS), {MHz(144), MHz(148),FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS},
FRQ_RNG_6m(2, FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS), /* AM class */ {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, RIG_FRNG_END,
}, },

3
rigs/yaesu/ft991.h
Wyświetl plik

@ -98,7 +98,8 @@
* *
*/ */
#define FT991_ANTS (RIG_ANT_1|RIG_ANT_2) // The FT991 does not have antenna selection
#define FT991_ANTS (RIG_ANT_CURR)
#define FT991_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */ #define FT991_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */
#define FT991_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */ #define FT991_OP_DATA_LENGTH 19 /* 0x10 P1 = 03 return size */