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

Update icom priv_data entries to standardize them

pull/193/head
Michael Black 2020-02-03 23:33:49 -06:00
rodzic 6066b66799
commit 864fe6f5c1
18 zmienionych plików z 36 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -188,9 +188,7 @@ static const struct icom_priv_caps ic7100_priv_caps =
0x88, /* default address */
0, /* 731 mode */
0, /* no XCHG */
.antack_len = 2,
.ant_count = 2,
.ts_sc_list = ic7100_ts_sc_list, /* FIXME */
ic7100_ts_sc_list, /* FIXME */
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_FAST, .icom_level = 1 },
@ -200,7 +198,9 @@ static const struct icom_priv_caps ic7100_priv_caps =
},
.rigparms = ic7100_rigparms,
.riglevels = ic7100_riglevels,
.extcmds = ic7100_extcmds
.extcmds = ic7100_extcmds,
.antack_len = 2,
.ant_count = 2
};
const struct rig_caps ic7100_caps =

4
rigs/icom/ic737.c
Wyświetl plik

@ -55,9 +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
.ant_count = 2
};
const struct rig_caps ic737_caps =

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

@ -96,9 +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 },

4
rigs/icom/ic746.c
Wyświetl plik

@ -167,9 +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 },
@ -393,9 +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 },

8
rigs/icom/ic756.c
Wyświetl plik

@ -132,9 +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 = {
@ -291,9 +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 },
@ -458,9 +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 },
@ -886,9 +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 },

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

@ -142,9 +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 },

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

@ -134,9 +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 },

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

@ -118,9 +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 },

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

@ -118,9 +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 },

8
rigs/icom/ic785x.c
Wyświetl plik

@ -120,12 +120,12 @@ int ic785x_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
*/
static struct icom_priv_caps ic785x_priv_caps =
{
.re_civ_addr = 0x8e, /* default address */
.civ_731_mode = 0, /* 731 mode */
.no_xchg = 0, /* no XCHG */
0x8e, /* default address */
0, /* 731 mode */
0, /* no XCHG */
ic756pro_ts_sc_list,
.antack_len = 3,
.ant_count = 4,
.ts_sc_list = ic756pro_ts_sc_list,
.agc_levels_present = 1,
.agc_levels = {
{ .level = RIG_AGC_OFF, .icom_level = 0 },

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

@ -99,9 +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 =

6
rigs/icom/icom.h
Wyświetl plik

@ -125,6 +125,8 @@ struct icom_priv_caps
int civ_731_mode; /* Off: freqs on 10 digits, On: freqs on 8 digits */
int no_xchg; /* Off: use VFO XCHG to set other VFO, On: use set VFO to set other VFO */
const struct ts_sc_list *ts_sc_list;
// the 4 elements above are mandatory
// everything below here is optional in the backends
int settle_time; /*!< Receiver settle time, in ms */
int (*r2i_mode)(RIG *rig, rmode_t mode, pbwidth_t width,
unsigned char *md, signed char *pd); /*< backend specific code
@ -135,10 +137,10 @@ struct icom_priv_caps
to convert response
tokens to bandwidth and
mode */
int antack_len; /* Length of 0x12 cmd may be 3 or 4 bytes as of 2020-01-22 e.g. 7851 */
int ant_count; /* number of antennas */
int serial_full_duplex; /*!< Whether RXD&TXD are not tied together */
int offs_len; /* Number of bytes in offset frequency field. 0 defaults to 3 */
int antack_len; /* Length of 0x12 cmd may be 3 or 4 bytes as of 2020-01-22 e.g. 7851 */
int ant_count; /* number of antennas discovered in set/get ant*/
int serial_USB_echo_check; /* Flag to test USB echo state */
int agc_levels_present; /* Flag to indicate that agc_levels array is populated */
struct icom_agc_level agc_levels[RIG_AGC_LAST + 1]; /* Icom rig-specific AGC levels, the last entry should have level -1 */

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

@ -118,9 +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 */

4
rigs/icom/icr6.c
Wyświetl plik

@ -51,9 +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 */
.ant_count = 2
};
const struct rig_caps icr6_caps =

4
rigs/icom/icr75.c
Wyświetl plik

@ -101,9 +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
.ant_count = 2
};
const struct rig_caps icr75_caps =

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

@ -107,9 +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 */

4
rigs/icom/icr9000.c
Wyświetl plik

@ -62,9 +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
.ant_count = 2
};
/*

4
rigs/icom/icr9500.c
Wyświetl plik

@ -78,9 +78,9 @@ static struct icom_priv_caps icr9500_priv_caps =
0x72, /* default address */
0, /* 731 mode */
0, /* no XCHG */
.ts_sc_list = r9500_ts_sc_list,
.antack_len = 2,
.ant_count = 3,
.ts_sc_list = r9500_ts_sc_list
.ant_count = 3
};
/*