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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/1464/head
Mike Black W9MDB 2023-12-21 08:17:19 -06:00
rodzic 633da3d7c6 25596f4c79
commit 7542f4cc71
29 zmienionych plików z 67 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1670,11 +1670,10 @@ typedef enum {
\endcode
*/
struct chan_list {
int startc; /*!< Starting memory channel \b number */
int endc; /*!< Ending memory channel \b number */
chan_type_t type; /*!< Memory type. see chan_type_t */
channel_cap_t
mem_caps; /*!< Definition of attributes that can be stored/retrieved */
int startc; /*!< Starting memory channel \b number */
int endc; /*!< Ending memory channel \b number */
chan_type_t type; /*!< Memory type. see chan_type_t */
channel_cap_t mem_caps; /*!< Definition of attributes that can be stored/retrieved */
};
//! @cond Doxygen_Suppress

1
rigs/icom/ic7100.c
Wyświetl plik

@ -384,6 +384,7 @@ struct rig_caps ic7100_caps =
{ 1, 396, RIG_MTYPE_MEM },
{ 397, 400, RIG_MTYPE_CALL },
{ 401, 424, RIG_MTYPE_EDGE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

15
rigs/icom/ic7300.c
Wyświetl plik

@ -753,11 +753,10 @@ struct rig_caps ic7300_caps =
.transceive = RIG_TRN_RIG,
.bank_qty = 1,
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -1318,11 +1317,10 @@ struct rig_caps ic705_caps =
.transceive = RIG_TRN_RIG,
.bank_qty = 5,
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -1592,11 +1590,10 @@ struct rig_caps ic905_caps =
.transceive = RIG_TRN_RIG,
.bank_qty = 5,
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/icom/ic7410.c
Wyświetl plik

@ -177,6 +177,7 @@ struct rig_caps ic7410_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/icom/ic7600.c
Wyświetl plik

@ -343,6 +343,7 @@ struct rig_caps ic7600_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

2
rigs/icom/ic7610.c
Wyświetl plik

@ -427,6 +427,8 @@ struct rig_caps ic7610_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 1, 8, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/icom/ic7700.c
Wyświetl plik

@ -318,6 +318,7 @@ struct rig_caps ic7700_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/icom/ic7800.c
Wyświetl plik

@ -215,6 +215,7 @@ struct rig_caps ic7800_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

4
rigs/kenwood/k2.c
Wyświetl plik

@ -160,7 +160,9 @@ struct rig_caps k2_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K2_MODES, -1, -1, K2_VFO, K2_ANTS},

24
rigs/kenwood/k3.c
Wyświetl plik

@ -238,7 +238,10 @@ struct rig_caps k3_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 4, RIG_MTYPE_VOICE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K3_MODES, -1, -1, K3_VFO, K3_ANTS},
@ -394,7 +397,10 @@ struct rig_caps k3s_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 4, RIG_MTYPE_VOICE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K3_MODES, -1, -1, K3_VFO, K3_ANTS},
@ -556,7 +562,10 @@ struct rig_caps k4_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 4, RIG_MTYPE_VOICE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K3_MODES, -1, -1, K3_VFO, K4_ANTS},
@ -711,7 +720,10 @@ struct rig_caps kx3_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 4, RIG_MTYPE_VOICE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K3_MODES, -1, -1, K3_VFO, K3_ANTS},
@ -866,7 +878,9 @@ struct rig_caps kx2_caps =
.bank_qty = 0,
.chan_desc_sz = 0,
.chan_list = { RIG_CHAN_END },
.chan_list = {
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END },
.rx_range_list1 = {
{kHz(500), MHz(30), K3_MODES, -1, -1, K3_VFO, K3_ANTS},

1
rigs/kenwood/ts2000.c
Wyświetl plik

@ -1729,6 +1729,7 @@ struct rig_caps ts2000_caps =
.chan_list = {
{ 0, 299, RIG_MTYPE_MEM, TS2000_MEM_CAP },
{ 1, 3, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/kenwood/ts570.c
Wyświetl plik

@ -1134,6 +1134,7 @@ struct rig_caps ts570d_caps =
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, TS570_MEM_CAP },
{ 90, 99, RIG_MTYPE_EDGE, TS570_MEM_CAP },
{ 1, 3, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
.rx_range_list1 = {

1
rigs/kenwood/ts590.c
Wyświetl plik

@ -2015,6 +2015,7 @@ struct rig_caps ts590sg_caps =
.chan_list = { /* TBC */
{ 0, 89, RIG_MTYPE_MEM, TS590_CHANNEL_CAPS },
{ 90, 99, RIG_MTYPE_EDGE, TS590_CHANNEL_CAPS },
{ 1, 3, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/kenwood/ts870s.c
Wyświetl plik

@ -586,6 +586,7 @@ struct rig_caps ts870s_caps =
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE },
{ 1, 4, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

6
rigs/kenwood/ts890s.c
Wyświetl plik

@ -422,7 +422,11 @@ struct rig_caps ts890s_caps =
.transceive = RIG_TRN_RIG,
.agc_level_count = 5,
.agc_levels = { RIG_AGC_OFF, RIG_AGC_SLOW, RIG_AGC_MEDIUM, RIG_AGC_FAST, RIG_AGC_ON },
.chan_list = {
{ 1, 6, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
.rx_range_list1 = {
{kHz(100), Hz(59999999), TS890_ALL_MODES, -1, -1, TS890_VFO},
RIG_FRNG_END,

2
rigs/kenwood/ts990s.c
Wyświetl plik

@ -181,6 +181,8 @@ struct rig_caps ts990s_caps =
.chan_list = {
{ 0, 299, RIG_MTYPE_MEM, TS990S_MEM_CAP },
{ 1, 6, RIG_MTYPE_VOICE },
{ 1, 8, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ft1200.c
Wyświetl plik

@ -202,6 +202,7 @@ struct rig_caps ftdx1200_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ft2000.c
Wyświetl plik

@ -184,6 +184,7 @@ struct rig_caps ft2000_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ft3000.c
Wyświetl plik

@ -297,6 +297,7 @@ struct rig_caps ftdx3000_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

3
rigs/yaesu/ft450.c
Wyświetl plik

@ -94,7 +94,8 @@ struct rig_caps ft450_caps =
.chan_list = {
{ 1, 500, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 501, 504, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
RIG_CHAN_END,
{ 1, 1, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
.rx_range_list1 = {

1
rigs/yaesu/ft5000.c
Wyświetl plik

@ -192,6 +192,7 @@ struct rig_caps ftdx5000_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ft710.c
Wyświetl plik

@ -177,6 +177,7 @@ struct rig_caps ft710_caps =
.comp_meter_cal = FT710_COMP_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ft891.c
Wyświetl plik

@ -185,6 +185,7 @@ struct rig_caps ft891_caps =
.str_cal = FT891_STR_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

2
rigs/yaesu/ft9000.c
Wyświetl plik

@ -98,6 +98,7 @@ struct rig_caps ft9000_caps =
/* TBC */
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -274,6 +275,7 @@ struct rig_caps ft9000Old_caps =
/* TBC */
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

2
rigs/yaesu/ft950.c
Wyświetl plik

@ -140,7 +140,7 @@ struct rig_caps ft950_caps =
{ 125, 128, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channels U51-U54 or US1-US4, if available */
{ 130, 130, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channel U55 or US5, if available */
{ 131, 131, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* EU5, 5167.5 KHz Alaska Emergency Freq, if available */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

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

@ -233,7 +233,9 @@ struct rig_caps ft991_caps =
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
{ 118, 127, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5MHz band
RIG_CHAN_END,
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
// Rig only has 1 model

1
rigs/yaesu/ftdx10.c
Wyświetl plik

@ -190,6 +190,7 @@ struct rig_caps ftdx10_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 501, 510, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channels, 5-01 - 5-10, if available */
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -232,6 +232,7 @@ struct rig_caps ftdx101d_caps =
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
{ 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5MHz band
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},

1
rigs/yaesu/ftdx101mp.c
Wyświetl plik

@ -133,6 +133,7 @@ struct rig_caps ftdx101mp_caps =
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
{ 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5MHz band
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},