Add antack_len and ant_count to all Icom rigs that have get/set_ant

pull/193/head
Michael Black 2020-02-03 15:59:36 -06:00
rodzic 8e63c6a21d
commit bf5180d77b
17 zmienionych plików z 79 dodań i 39 usunięć

Wyświetl plik

@ -188,7 +188,9 @@ static const struct icom_priv_caps ic7100_priv_caps =
0x88, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic7100_ts_sc_list, /* FIXME */
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic7100_ts_sc_list, /* FIXME */
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },

Wyświetl plik

@ -55,7 +55,9 @@ static const struct icom_priv_caps ic737_priv_caps =
0x3c, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic737_ts_sc_list
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic737_ts_sc_list
};
const struct rig_caps ic737_caps =
@ -63,7 +65,7 @@ const struct rig_caps ic737_caps =
.rig_model = RIG_MODEL_IC737,
.model_name = "IC-737",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -96,7 +96,9 @@ static const struct icom_priv_caps ic7410_priv_caps =
0x80, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },
@ -113,7 +115,7 @@ const struct rig_caps ic7410_caps =
.rig_model = RIG_MODEL_IC7410,
.model_name = "IC-7410",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -167,7 +167,9 @@ static const struct icom_priv_caps ic746_priv_caps =
0x56, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },
@ -182,7 +184,7 @@ const struct rig_caps ic746_caps =
.rig_model = RIG_MODEL_IC746,
.model_name = "IC-746",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
.version = BACKEND_VER ".4",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -391,7 +393,9 @@ static const struct icom_priv_caps ic746pro_priv_caps =
0x66, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },
@ -407,7 +411,7 @@ const struct rig_caps ic746pro_caps =
.rig_model = RIG_MODEL_IC746PRO,
.model_name = "IC-746PRO",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -132,7 +132,9 @@ static const struct icom_priv_caps ic756_priv_caps =
0x50, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756_ts_sc_list,
.r2i_mode = r2i_mode,
.agc_levels_present = 1,
.agc_levels = {
@ -148,7 +150,7 @@ const struct rig_caps ic756_caps =
.rig_model = RIG_MODEL_IC756,
.model_name = "IC-756",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -289,7 +291,9 @@ static const struct icom_priv_caps ic756pro_priv_caps =
0x5c, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -304,7 +308,7 @@ const struct rig_caps ic756pro_caps =
.rig_model = RIG_MODEL_IC756PRO,
.model_name = "IC-756PRO",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -454,7 +458,9 @@ static const struct icom_priv_caps ic756pro2_priv_caps =
0x64, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -537,7 +543,7 @@ const struct rig_caps ic756pro2_caps =
.rig_model = RIG_MODEL_IC756PROII,
.model_name = "IC-756PROII",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -880,7 +886,9 @@ static const struct icom_priv_caps ic756pro3_priv_caps =
0x6e, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -955,7 +963,7 @@ const struct rig_caps ic756pro3_caps =
.rig_model = RIG_MODEL_IC756PROIII,
.model_name = "IC-756PROIII",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -142,7 +142,9 @@ static const struct icom_priv_caps ic7600_priv_caps =
0x7a, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 3,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -168,7 +170,7 @@ const struct rig_caps ic7600_caps =
.rig_model = RIG_MODEL_IC7600,
.model_name = "IC-7600",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -134,7 +134,9 @@ static const struct icom_priv_caps ic7610_priv_caps =
0x98, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -166,7 +168,7 @@ const struct rig_caps ic7610_caps =
.rig_model = RIG_MODEL_IC7610,
.model_name = "IC-7610",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -118,7 +118,9 @@ static const struct icom_priv_caps ic7700_priv_caps =
0x74, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 4,
.ant_count = 3,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },
@ -151,7 +153,7 @@ const struct rig_caps ic7700_caps =
.rig_model = RIG_MODEL_IC7700,
.model_name = "IC-7700",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -118,7 +118,9 @@ static const struct icom_priv_caps ic7800_priv_caps =
0x6a, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 4,
.ant_count = 3,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },
@ -151,7 +153,7 @@ const struct rig_caps ic7800_caps =
.rig_model = RIG_MODEL_IC7800,
.model_name = "IC-7800",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
.version = BACKEND_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -124,7 +124,7 @@ static struct icom_priv_caps ic785x_priv_caps =
.civ_731_mode = 0, /* 731 mode */
.no_xchg = 0, /* no XCHG */
.antack_len = 3,
// .ant_count = 4, // disabled for test automatic detection
.ant_count = 4,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {

Wyświetl plik

@ -99,7 +99,9 @@ static const struct icom_priv_caps ic9100_priv_caps =
0x7c, /* default address */
0, /* 731 mode */
1, /* no XCHG to avoid display flicker */
ic910_ts_sc_list, /* FIXME */
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic910_ts_sc_list, /* FIXME */
};
const struct rig_caps ic9100_caps =
@ -107,7 +109,7 @@ const struct rig_caps ic9100_caps =
.rig_model = RIG_MODEL_IC9100,
.model_name = "IC-9100",
.mfg_name = "Icom",
.version = BACKEND_VER".2",
.version = BACKEND_VER".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,

Wyświetl plik

@ -118,7 +118,9 @@ static struct icom_priv_caps icr30_priv_caps =
0x9c, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r8500_ts_sc_list, /* wrong, but don't have set_ts anyway */
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = r8500_ts_sc_list, /* wrong, but don't have set_ts anyway */
.r2i_mode = icr30_r2i_mode,
.offs_len = 4,
.extcmds = icr30_extcmds /* Custom ext_parm parameters */
@ -129,7 +131,7 @@ const struct rig_caps icr30_caps =
.rig_model = RIG_MODEL_ICR30,
.model_name = "IC-R30",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,

Wyświetl plik

@ -51,7 +51,9 @@ static struct icom_priv_caps icr6_priv_caps =
0x7e, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r8500_ts_sc_list /* wrong, but don't have set_ts anyway */
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = r8500_ts_sc_list /* wrong, but don't have set_ts anyway */
};
const struct rig_caps icr6_caps =
@ -59,7 +61,7 @@ const struct rig_caps icr6_caps =
.rig_model = RIG_MODEL_ICR6,
.model_name = "IC-R6",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_RECEIVER | RIG_FLAG_HANDHELD,

Wyświetl plik

@ -101,7 +101,9 @@ static struct icom_priv_caps icr75_priv_caps =
0x5a, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r75_ts_sc_list
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = r75_ts_sc_list
};
const struct rig_caps icr75_caps =
@ -109,7 +111,7 @@ const struct rig_caps icr75_caps =
.rig_model = RIG_MODEL_ICR75,
.model_name = "IC-R75",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_RECEIVER,

Wyświetl plik

@ -107,7 +107,9 @@ static struct icom_priv_caps icr8600_priv_caps =
0x96, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r8600_ts_sc_list, /* list of tuning steps */
.antack_len = 2,
.ant_count = 3,
.ts_sc_list = r8600_ts_sc_list, /* list of tuning steps */
.offs_len = 4, /* Repeater offset is 4 bytes */
.serial_USB_echo_check = 1, /* USB CI-V may not echo */
.rigparms = icr8600_rigparms, /* Custom parm parameters */
@ -119,7 +121,7 @@ const struct rig_caps icr8600_caps =
.rig_model = RIG_MODEL_ICR8600,
.model_name = "IC-R8600",
.mfg_name = "Icom",
.version = "0.8",
.version = "0.9",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_RECEIVER,

Wyświetl plik

@ -62,7 +62,9 @@ static struct icom_priv_caps icr9000_priv_caps =
0x2a, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r9000_ts_sc_list
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = r9000_ts_sc_list
};
/*

Wyświetl plik

@ -78,7 +78,9 @@ static struct icom_priv_caps icr9500_priv_caps =
0x72, /* default address */
0, /* 731 mode */
0, /* no XCHG */
r9500_ts_sc_list
.antack_len = 2,
.ant_count = 3,
.ts_sc_list = r9500_ts_sc_list
};
/*
@ -89,7 +91,7 @@ const struct rig_caps icr9500_caps =
.rig_model = RIG_MODEL_ICR9500,
.model_name = "IC-R9500",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
.version = BACKEND_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_RECEIVER,