diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 008b32eee..a4066cbf1 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -1663,11 +1663,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 diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index 16ed4d3fc..d6cc30453 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -382,6 +382,7 @@ const 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, }, diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c index 06679572f..4a8a332c7 100644 --- a/rigs/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -755,11 +755,10 @@ const 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, }, @@ -1324,11 +1323,10 @@ const 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, }, @@ -1600,11 +1598,10 @@ const 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, }, diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c index 1ebc4707c..bb9a0db00 100644 --- a/rigs/icom/ic7410.c +++ b/rigs/icom/ic7410.c @@ -179,6 +179,7 @@ const 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, }, diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c index 89c0328d1..1f3c612f5 100644 --- a/rigs/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -341,6 +341,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, }, diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c index ce327e324..dfcbddccf 100644 --- a/rigs/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -422,6 +422,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, }, diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c index debd3644f..61c49d861 100644 --- a/rigs/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -316,6 +316,7 @@ const 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, }, diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c index 00af91d85..ad4266e94 100644 --- a/rigs/icom/ic7800.c +++ b/rigs/icom/ic7800.c @@ -215,6 +215,7 @@ const 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, }, diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c index bca431dde..c5359d015 100644 --- a/rigs/kenwood/k2.c +++ b/rigs/kenwood/k2.c @@ -160,7 +160,9 @@ const 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}, diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index c81c3550f..b863d5c8d 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -238,7 +238,10 @@ const 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 @@ const 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 @@ const 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 @@ const 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 @@ const 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}, diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 9e62a0817..1ca20d05a 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -1730,6 +1730,7 @@ const struct rig_caps ts2000_caps = .chan_list = { { 0, 299, RIG_MTYPE_MEM, TS2000_MEM_CAP }, + { 1, 3, RIG_MTYPE_MORSE }, RIG_CHAN_END, }, diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c index 772599269..8820b8278 100644 --- a/rigs/kenwood/ts570.c +++ b/rigs/kenwood/ts570.c @@ -1134,6 +1134,7 @@ const 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 = { diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index 9a4c1dc48..dcec334e7 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -1994,6 +1994,7 @@ const 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, }, diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c index da45bff2d..61b1a5436 100644 --- a/rigs/kenwood/ts870s.c +++ b/rigs/kenwood/ts870s.c @@ -586,6 +586,7 @@ const 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, }, diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c index f71d009fb..4abd36681 100644 --- a/rigs/kenwood/ts890s.c +++ b/rigs/kenwood/ts890s.c @@ -414,7 +414,11 @@ const 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, diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c index 112c3cba3..74a973fc5 100644 --- a/rigs/kenwood/ts990s.c +++ b/rigs/kenwood/ts990s.c @@ -181,6 +181,8 @@ const 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, }, diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c index eca6c098f..eb3b20acc 100644 --- a/rigs/yaesu/ft1200.c +++ b/rigs/yaesu/ft1200.c @@ -202,6 +202,7 @@ const 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, }, diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c index c8fc41cbd..35c146a45 100644 --- a/rigs/yaesu/ft2000.c +++ b/rigs/yaesu/ft2000.c @@ -184,6 +184,7 @@ const 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, }, diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c index 7774b7895..6c1f27edc 100644 --- a/rigs/yaesu/ft3000.c +++ b/rigs/yaesu/ft3000.c @@ -297,6 +297,7 @@ const 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, }, diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c index 5377211b9..a6fa56ec3 100644 --- a/rigs/yaesu/ft450.c +++ b/rigs/yaesu/ft450.c @@ -94,7 +94,8 @@ const 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 = { diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c index d7421b280..284063a7e 100644 --- a/rigs/yaesu/ft5000.c +++ b/rigs/yaesu/ft5000.c @@ -192,6 +192,7 @@ const 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, }, diff --git a/rigs/yaesu/ft710.c b/rigs/yaesu/ft710.c index 792350806..10e8ae249 100644 --- a/rigs/yaesu/ft710.c +++ b/rigs/yaesu/ft710.c @@ -177,6 +177,7 @@ const 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, }, diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c index 2d5309344..68a426145 100644 --- a/rigs/yaesu/ft891.c +++ b/rigs/yaesu/ft891.c @@ -185,6 +185,7 @@ const 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, }, diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c index 7f5b61f85..cbc7aa28e 100644 --- a/rigs/yaesu/ft9000.c +++ b/rigs/yaesu/ft9000.c @@ -98,6 +98,7 @@ const 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 @@ const 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, }, diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c index 2ee973d55..6c99924d3 100644 --- a/rigs/yaesu/ft950.c +++ b/rigs/yaesu/ft950.c @@ -141,7 +141,7 @@ const 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, }, diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index cd5ef0503..9449df4a3 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -233,7 +233,9 @@ const 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 diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c index 65e9dade9..11c486b42 100644 --- a/rigs/yaesu/ftdx10.c +++ b/rigs/yaesu/ftdx10.c @@ -190,6 +190,7 @@ const 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, }, diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c index 0473b7b85..e22527687 100644 --- a/rigs/yaesu/ftdx101.c +++ b/rigs/yaesu/ftdx101.c @@ -232,6 +232,7 @@ const 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, }, diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c index bf0cd4a0a..6f2b59284 100644 --- a/rigs/yaesu/ftdx101mp.c +++ b/rigs/yaesu/ftdx101mp.c @@ -133,6 +133,7 @@ const 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, },