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

Fix ptt_share segmentation fault 

https://github.com/Hamlib/Hamlib/issues/1433
Fix ID5100 0x25 and simplex VFO actions
https://github.com/Hamlib/Hamlib/issues/1429
pull/1434/head
Mike Black W9MDB 2023-11-23 15:00:05 -06:00
rodzic f28d674211
commit 9841e500b9
295 zmienionych plików z 1017 dodań i 720 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
extra/gnuradio/gnuradio.h
Wyświetl plik

@ -61,10 +61,10 @@ int graudioiq_open(RIG *rig);
extern const struct confparams gnuradio_cfg_params[];
extern const struct rig_caps gr_caps;
extern const struct rig_caps mc4020_caps;
extern const struct rig_caps graudio_caps;
extern const struct rig_caps graudioiq_caps;
extern struct rig_caps gr_caps;
extern struct rig_caps mc4020_caps;
extern struct rig_caps graudio_caps;
extern struct rig_caps graudioiq_caps;
__END_DECLS

2
extra/gnuradio/gr.c
Wyświetl plik

@ -49,7 +49,7 @@ static const struct gnuradio_priv_caps gr_priv_caps =
.IF_center_freq = MHz(5.75),
};
const struct rig_caps gr_caps =
struct rig_caps gr_caps =
{
.rig_model = RIG_MODEL_GNURADIO,
.model_name = "GNU Radio dev",

4
extra/gnuradio/graudio.c
Wyświetl plik

@ -52,7 +52,7 @@ static const struct gnuradio_priv_caps graudio_priv_caps =
};
const struct rig_caps graudio_caps =
struct rig_caps graudio_caps =
{
.rig_model = RIG_MODEL_GRAUDIO,
.model_name = "GNU Radio GrAudio",
@ -126,7 +126,7 @@ const struct rig_caps graudio_caps =
.vfo_op = gnuradio_vfo_op,
};
const struct rig_caps graudioiq_caps =
struct rig_caps graudioiq_caps =
{
.rig_model = RIG_MODEL_GRAUDIOIQ,
.model_name = "GNU Radio GrAudio I&Q",

2
extra/gnuradio/mc4020.c
Wyświetl plik

@ -49,7 +49,7 @@ static const struct gnuradio_priv_caps mc4020_priv_caps =
};
const struct rig_caps mc4020_caps =
struct rig_caps mc4020_caps =
{
.rig_model = RIG_MODEL_MC4020,
.model_name = "GNU Radio MC4020",

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

@ -2782,6 +2782,7 @@ struct rig_state {
void *multicast_receiver_priv_data;
rig_comm_status_t comm_status; /*!< Detailed rig control status */
char device_id[HAMLIB_RIGNAMSIZ];
int dual_watch; /*!< Boolean DUAL_WATCH status */
};
/**
@ -3595,7 +3596,7 @@ rig_set_uplink HAMLIB_PARAMS((RIG *rig,
extern HAMLIB_EXPORT(const char *)
rig_get_info HAMLIB_PARAMS((RIG *rig));
extern HAMLIB_EXPORT(const struct rig_caps *)
extern HAMLIB_EXPORT(struct rig_caps *)
rig_get_caps HAMLIB_PARAMS((rig_model_t rig_model));
extern HAMLIB_EXPORT(const freq_range_t *)
@ -3676,13 +3677,13 @@ extern HAMLIB_EXPORT(FILE *)
rig_set_debug_file HAMLIB_PARAMS((FILE *stream));
extern HAMLIB_EXPORT(int)
rig_register HAMLIB_PARAMS((const struct rig_caps *caps));
rig_register HAMLIB_PARAMS((struct rig_caps *caps));
extern HAMLIB_EXPORT(int)
rig_unregister HAMLIB_PARAMS((rig_model_t rig_model));
extern HAMLIB_EXPORT(int)
rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rig_caps *, rig_ptr_t),
rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(struct rig_caps *, rig_ptr_t),
rig_ptr_t data));
extern HAMLIB_EXPORT(int)

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

@ -46,7 +46,7 @@ public:
#endif
const struct rig_caps *caps;
struct rig_caps *caps;
// This method opens the communication port to the rig
void open(void);

2
rigs/adat/adat.h
Wyświetl plik

@ -610,7 +610,7 @@ int adat_power2mW(RIG *, unsigned int *, float, freq_t, rmode_t);
int adat_get_powerstat(RIG *, powerstat_t *);
extern const struct rig_caps adt_200a_caps;
extern struct rig_caps adt_200a_caps;
// ---------------------------------------------------------------------------
// END OF FILE

2
rigs/adat/adt_200a.c
Wyświetl plik

@ -48,7 +48,7 @@
// ADT-200A HAMLIB CAPS / DESCRIPTION
// ---------------------------------------------------------------------------
const struct rig_caps adt_200a_caps =
struct rig_caps adt_200a_caps =
{
RIG_MODEL(RIG_MODEL_ADT_200A),
.model_name = "ADT-200A",

4
rigs/alinco/alinco.h
Wyświetl plik

@ -26,8 +26,8 @@
#define BACKEND_VER "20200323"
extern const struct rig_caps dx77_caps;
extern const struct rig_caps dxsr8_caps;
extern struct rig_caps dx77_caps;
extern struct rig_caps dxsr8_caps;
#define BUFSZ 32

4
rigs/alinco/dx77.c
Wyświetl plik

@ -150,7 +150,7 @@ int dx77_get_mem(RIG *rig, vfo_t vfo, int *ch);
* - up/down
* - scan
*/
const struct rig_caps dx77_caps =
struct rig_caps dx77_caps =
{
RIG_MODEL(RIG_MODEL_DX77),
.model_name = "DX-77",
@ -1260,7 +1260,7 @@ int dx77_set_parm(RIG *rig, setting_t parm, value_t val)
*/
int dx77_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
{
const struct rig_caps *caps;
struct rig_caps *caps;
unsigned char tonebuf[BUFSZ];
int i;

2
rigs/alinco/dxsr8.c
Wyświetl plik

@ -75,7 +75,7 @@ int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
* https://yo5ptd.wordpress.com/2017/02/12/alinco-dx-sr8/
* for a partially documented protocol
*/
const struct rig_caps dxsr8_caps =
struct rig_caps dxsr8_caps =
{
RIG_MODEL(RIG_MODEL_DXSR8),
.model_name = "DX-SR8",

2
rigs/anytone/anytone.h
Wyświetl plik

@ -7,7 +7,7 @@
#define ANYTONE_RESPSZ 64
extern const struct rig_caps anytone_d578_caps;
extern struct rig_caps anytone_d578_caps;
#ifdef PTHREAD
#include <pthread.h>

2
rigs/anytone/d578.c
Wyświetl plik

@ -26,7 +26,7 @@
#define D578_VFO (RIG_VFO_A|RIG_VFO_B)
#define D578_MODES (RIG_MODE_USB|RIG_MODE_AM)
const struct rig_caps anytone_d578_caps =
struct rig_caps anytone_d578_caps =
{
RIG_MODEL(RIG_MODEL_ATD578UVIII),
.model_name = "D578A",

22
rigs/aor/aor.h
Wyświetl plik

@ -64,16 +64,16 @@ int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only);
int aor_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
int aor_get_chan_all_cb (RIG * rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
extern const struct rig_caps ar2700_caps;
extern const struct rig_caps ar8200_caps;
extern const struct rig_caps ar8000_caps;
extern const struct rig_caps ar8600_caps;
extern const struct rig_caps ar5000_caps;
extern const struct rig_caps ar3000a_caps;
extern const struct rig_caps ar7030_caps;
extern const struct rig_caps ar3030_caps;
extern const struct rig_caps ar5000a_caps;
extern const struct rig_caps ar7030p_caps;
extern const struct rig_caps sr2200_caps;
extern struct rig_caps ar2700_caps;
extern struct rig_caps ar8200_caps;
extern struct rig_caps ar8000_caps;
extern struct rig_caps ar8600_caps;
extern struct rig_caps ar5000_caps;
extern struct rig_caps ar3000a_caps;
extern struct rig_caps ar7030_caps;
extern struct rig_caps ar3030_caps;
extern struct rig_caps ar5000a_caps;
extern struct rig_caps ar7030p_caps;
extern struct rig_caps sr2200_caps;
#endif /* _AOR_H */

2
rigs/aor/ar2700.c
Wyświetl plik

@ -80,7 +80,7 @@ static const struct aor_priv_caps ar2700_priv_caps =
* part of info from http://www.aoruk.com/2700.htm
* Interface unit: CU-8232 (or equivalent)
*/
const struct rig_caps ar2700_caps =
struct rig_caps ar2700_caps =
{
RIG_MODEL(RIG_MODEL_AR2700),
.model_name = "AR2700",

2
rigs/aor/ar3000.c
Wyświetl plik

@ -62,7 +62,7 @@ static int ar3k_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
* TODO:
* set_channel, get_channel, set_func MUTE,SQL, get_dcd, ...
*/
const struct rig_caps ar3000a_caps =
struct rig_caps ar3000a_caps =
{
RIG_MODEL(RIG_MODEL_AR3000A),
.model_name = "AR3000A",

2
rigs/aor/ar3030.c
Wyświetl plik

@ -93,7 +93,7 @@ struct ar3030_priv_data
*
* ar3030 rig capabilities.
*/
const struct rig_caps ar3030_caps =
struct rig_caps ar3030_caps =
{
RIG_MODEL(RIG_MODEL_AR3030),
.model_name = "AR3030",

4
rigs/aor/ar5000.c
Wyświetl plik

@ -99,7 +99,7 @@ static const struct aor_priv_caps ar5k_priv_caps =
*
* TODO: retrieve BW info, and rest of commands
*/
const struct rig_caps ar5000_caps =
struct rig_caps ar5000_caps =
{
RIG_MODEL(RIG_MODEL_AR5000),
.model_name = "AR5000",
@ -245,7 +245,7 @@ const struct rig_caps ar5000_caps =
*
* TODO: retrieve BW info, and rest of commands
*/
const struct rig_caps ar5000a_caps =
struct rig_caps ar5000a_caps =
{
RIG_MODEL(RIG_MODEL_AR5000A),
.model_name = "AR5000A",

2
rigs/aor/ar7030.c
Wyświetl plik

@ -772,7 +772,7 @@ static int ar7030_reset(RIG *rig, reset_t reset)
const struct rig_caps ar7030_caps =
struct rig_caps ar7030_caps =
{
RIG_MODEL(RIG_MODEL_AR7030),
.model_name = "AR7030",

4
rigs/aor/ar7030p.c
Wyświetl plik

@ -483,7 +483,7 @@ static int ar7030p_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK == rc)
{
const struct rig_caps *caps = rig->caps;
struct rig_caps *caps = rig->caps;
if ((caps->rx_range_list1[ 0 ].endf > freq) &&
(caps->rx_range_list1[ 0 ].startf < freq))
@ -1770,7 +1770,7 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
return (rc);
}
const struct rig_caps ar7030p_caps =
struct rig_caps ar7030p_caps =
{
RIG_MODEL(RIG_MODEL_AR7030P),
.model_name = "AR7030 Plus",

2
rigs/aor/ar8000.c
Wyświetl plik

@ -60,7 +60,7 @@ static const struct aor_priv_caps ar8000_priv_caps =
*
* part of info from http://www.aoruk.com/8000.htm
*/
const struct rig_caps ar8000_caps =
struct rig_caps ar8000_caps =
{
RIG_MODEL(RIG_MODEL_AR8000),
.model_name = "AR8000",

2
rigs/aor/ar8200.c
Wyświetl plik

@ -84,7 +84,7 @@ static const struct aor_priv_caps ar8k_priv_caps =
*
* part of info from http://www.aoruk.com/8200.htm
*/
const struct rig_caps ar8200_caps =
struct rig_caps ar8200_caps =
{
RIG_MODEL(RIG_MODEL_AR8200),
.model_name = "AR8200",

2
rigs/aor/ar8600.c
Wyświetl plik

@ -86,7 +86,7 @@ static const struct aor_priv_caps ar8600_priv_caps =
*
* part of info from http://www.aoruk.com/8600.htm
*/
const struct rig_caps ar8600_caps =
struct rig_caps ar8600_caps =
{
RIG_MODEL(RIG_MODEL_AR8600),
.model_name = "AR8600",

2
rigs/aor/sr2200.c
Wyświetl plik

@ -119,7 +119,7 @@ static const struct aor_priv_caps sr2200_priv_caps =
*
* TODO: retrieve BW info, and rest of commands
*/
const struct rig_caps sr2200_caps =
struct rig_caps sr2200_caps =
{
RIG_MODEL(RIG_MODEL_SR2200),
.model_name = "SR2200",

2
rigs/barrett/4050.c
Wyświetl plik

@ -94,7 +94,7 @@ static int barrett4050_open(RIG *rig)
RETURNFUNC(RIG_OK);
}
const struct rig_caps barrett4050_caps =
struct rig_caps barrett4050_caps =
{
RIG_MODEL(RIG_MODEL_BARRETT_4050),
.model_name = "4050",

2
rigs/barrett/950.c
Wyświetl plik

@ -66,7 +66,7 @@ static struct chan_map_s chan_map[] =
{ 28.0, 30.0, 9}
};
const struct rig_caps barrett950_caps =
struct rig_caps barrett950_caps =
{
RIG_MODEL(RIG_MODEL_BARRETT_950),
.model_name = "950",

2
rigs/barrett/barrett.c
Wyświetl plik

@ -756,7 +756,7 @@ int barrett_open(RIG *rig)
}
const struct rig_caps barrett_caps =
struct rig_caps barrett_caps =
{
RIG_MODEL(RIG_MODEL_BARRETT_2050),
.model_name = "2050",

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

@ -36,9 +36,9 @@
// RET_LEN is # of max channels times the per-channel response length
#define BARRETT_RET_LEN 24*1000
extern const struct rig_caps barrett_caps;
extern const struct rig_caps barrett950_caps;
extern const struct rig_caps barrett4050_caps;
extern struct rig_caps barrett_caps;
extern struct rig_caps barrett950_caps;
extern struct rig_caps barrett4050_caps;
struct barrett_priv_data {
char cmd_str[BARRETT_DATA_LEN]; /* command string buffer */

4
rigs/codan/codan.c
Wyświetl plik

@ -410,7 +410,7 @@ int codan_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
const struct rig_caps envoy_caps =
struct rig_caps envoy_caps =
{
RIG_MODEL(RIG_MODEL_CODAN_ENVOY),
.model_name = "Envoy",
@ -475,7 +475,7 @@ const struct rig_caps envoy_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
const struct rig_caps ngs_caps =
struct rig_caps ngs_caps =
{
RIG_MODEL(RIG_MODEL_CODAN_NGT),
.model_name = "NGT",

4
rigs/codan/codan.h
Wyświetl plik

@ -34,8 +34,8 @@
// But that would 9999*41 or 406KB so didn't do that right now
#define CODAN_DATA_LEN 64
extern const struct rig_caps envoy_caps;
extern const struct rig_caps ngs_caps;
extern struct rig_caps envoy_caps;
extern struct rig_caps ngs_caps;
struct codan_priv_data {
char cmd_str[CODAN_DATA_LEN]; /* command string buffer */

4
rigs/dorji/dorji.h
Wyświetl plik

@ -24,7 +24,7 @@
#include "hamlib/rig.h"
extern const struct rig_caps dra818u_caps;
extern const struct rig_caps dra818v_caps;
extern struct rig_caps dra818u_caps;
extern struct rig_caps dra818v_caps;
#endif /* _DORJI_H */

4
rigs/dorji/dra818.c
Wyświetl plik

@ -519,7 +519,7 @@ int dra818_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
return RIG_OK;
}
const struct rig_caps dra818u_caps =
struct rig_caps dra818u_caps =
{
RIG_MODEL(RIG_MODEL_DORJI_DRA818U),
.model_name = "DRA818U",
@ -623,7 +623,7 @@ const struct rig_caps dra818u_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
const struct rig_caps dra818v_caps =
struct rig_caps dra818v_caps =
{
RIG_MODEL(RIG_MODEL_DORJI_DRA818V),
.model_name = "DRA818V",

4
rigs/drake/drake.h
Wyświetl plik

@ -53,8 +53,8 @@ int drake_set_powerstat (RIG * rig, powerstat_t status);
int drake_get_powerstat (RIG * rig, powerstat_t *status);
const char *drake_get_info(RIG *rig);
extern const struct rig_caps r8a_caps;
extern const struct rig_caps r8b_caps;
extern struct rig_caps r8a_caps;
extern struct rig_caps r8b_caps;
#endif /* _DRAKE_H */

2
rigs/drake/r8a.c
Wyświetl plik

@ -78,7 +78,7 @@
*
*/
const struct rig_caps r8a_caps =
struct rig_caps r8a_caps =
{
RIG_MODEL(RIG_MODEL_DKR8A),
.model_name = "R-8A",

2
rigs/drake/r8b.c
Wyświetl plik

@ -78,7 +78,7 @@
*
*/
const struct rig_caps r8b_caps =
struct rig_caps r8b_caps =
{
RIG_MODEL(RIG_MODEL_DKR8B),
.model_name = "R-8B",

2
rigs/dummy/aclog.c
Wyświetl plik

@ -933,7 +933,7 @@ static int aclog_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
}
const struct rig_caps aclog_caps =
struct rig_caps aclog_caps =
{
RIG_MODEL(RIG_MODEL_ACLOG),
.model_name = "ACLog",

10
rigs/dummy/dummy.h
Wyświetl plik

@ -42,11 +42,11 @@
extern struct rig_caps dummy_caps;
extern struct rig_caps dummy_no_vfo_caps;
extern struct rig_caps netrigctl_caps;
extern const struct rig_caps flrig_caps;
extern const struct rig_caps trxmanager_caps;
extern const struct rig_caps tci1x_caps;
extern const struct rig_caps aclog_caps;
extern const struct rig_caps sdrsharp_caps;
extern struct rig_caps flrig_caps;
extern struct rig_caps trxmanager_caps;
extern struct rig_caps tci1x_caps;
extern struct rig_caps aclog_caps;
extern struct rig_caps sdrsharp_caps;
extern struct rig_caps quisk_caps;
int netrigctl_get_vfo_mode(RIG *);

2
rigs/dummy/flrig.c
Wyświetl plik

@ -138,7 +138,7 @@ static const struct confparams flrig_ext_parms[] =
{ RIG_CONF_END, NULL, }
};
const struct rig_caps flrig_caps =
struct rig_caps flrig_caps =
{
RIG_MODEL(RIG_MODEL_FLRIG),
.model_name = "FLRig",

2
rigs/dummy/flrig.h
Wyświetl plik

@ -28,6 +28,6 @@
#define TRUE 1
#define FALSE 0
extern const struct rig_caps flrig_caps;
extern struct rig_caps flrig_caps;
#endif /* _FLRIG_H */

2
rigs/dummy/sdrsharp.c
Wyświetl plik

@ -519,7 +519,7 @@ static int sdrsharp_get_vfo(RIG *rig, vfo_t *vfo)
RETURNFUNC(RIG_OK);
}
const struct rig_caps sdrsharp_caps =
struct rig_caps sdrsharp_caps =
{
RIG_MODEL(RIG_MODEL_SDRSHARP),
.model_name = "SDR#/gpredict",

2
rigs/dummy/tci1x.c
Wyświetl plik

@ -132,7 +132,7 @@ static const struct confparams tci1x_ext_parms[] =
{ RIG_CONF_END, NULL, }
};
const struct rig_caps tci1x_caps =
struct rig_caps tci1x_caps =
{
RIG_MODEL(RIG_MODEL_TCI1X),
.model_name = "TCI1.X",

10
rigs/elad/elad.c
Wyświetl plik

@ -2468,7 +2468,7 @@ int elad_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
*/
int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
{
const struct rig_caps *caps;
struct rig_caps *caps;
char tonebuf[16];
int i;
@ -2498,7 +2498,7 @@ int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
{
const struct rig_caps *caps = rig->caps;
struct rig_caps *caps = rig->caps;
char buf[16];
int i;
@ -2560,7 +2560,7 @@ int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
int elad_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
{
const struct elad_priv_data *priv = rig->state.priv;
const struct rig_caps *caps;
struct rig_caps *caps;
char tonebuf[3];
int i, retval;
unsigned int tone_idx;
@ -2637,7 +2637,7 @@ int elad_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
{
const struct rig_caps *caps = rig->caps;
struct rig_caps *caps = rig->caps;
char buf[16];
int i;
@ -2693,7 +2693,7 @@ int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
int elad_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
{
const struct rig_caps *caps;
struct rig_caps *caps;
char cmd[4];
char tonebuf[6];
int offs;

2
rigs/elad/elad.h
Wyświetl plik

@ -164,7 +164,7 @@ int elad_get_trn(RIG *rig, int *trn);
int get_elad_level(RIG *rig, const char *cmd, float *f);
int get_elad_func(RIG *rig, const char *cmd, int *status);
extern const struct rig_caps fdm_duo_caps;
extern struct rig_caps fdm_duo_caps;
#if 0
/* use when not interested in the answer, but want to check its len */

2
rigs/elad/fdm_duo.c
Wyświetl plik

@ -328,7 +328,7 @@ static struct elad_priv_caps fdm_duo_priv_caps =
* Notice that some rigs share the same functions.
* Also this struct is READONLY!
*/
const struct rig_caps fdm_duo_caps =
struct rig_caps fdm_duo_caps =
{
RIG_MODEL(RIG_MODEL_ELAD_FDM_DUO),
.model_name = "FDM-DUO",

4
rigs/flexradio/dttsp.c
Wyświetl plik

@ -155,7 +155,7 @@ static const struct hamlib_vs_dttsp
{ 50, 40 }, /* +40 */ \
} }
const struct rig_caps dttsp_rig_caps =
struct rig_caps dttsp_rig_caps =
{
RIG_MODEL(RIG_MODEL_DTTSP),
.model_name = "DttSP IPC",
@ -241,7 +241,7 @@ const struct rig_caps dttsp_rig_caps =
/*
* The same as the previous IPC, but of type RIG_PORT_UDP_NETWORK
*/
const struct rig_caps dttsp_udp_rig_caps =
struct rig_caps dttsp_udp_rig_caps =
{
RIG_MODEL(RIG_MODEL_DTTSP_UDP),
.model_name = "DttSP UDP",

8
rigs/flexradio/flexradio.h
Wyświetl plik

@ -24,9 +24,9 @@
#include "hamlib/rig.h"
extern const struct rig_caps sdr1k_rig_caps;
extern const struct rig_caps sdr1krfe_rig_caps;
extern const struct rig_caps dttsp_rig_caps;
extern const struct rig_caps dttsp_udp_rig_caps;
extern struct rig_caps sdr1k_rig_caps;
extern struct rig_caps sdr1krfe_rig_caps;
extern struct rig_caps dttsp_rig_caps;
extern struct rig_caps dttsp_udp_rig_caps;
#endif /* _FLEXRADIO_H */

2
rigs/flexradio/sdr1k.c
Wyświetl plik

@ -110,7 +110,7 @@ struct sdr1k_priv_data
* What about IOUD_Clock?
*/
const struct rig_caps sdr1k_rig_caps =
struct rig_caps sdr1k_rig_caps =
{
RIG_MODEL(RIG_MODEL_SDR1000),
.model_name = "SDR-1000",

4
rigs/gomspace/gs100.h
Wyświetl plik

@ -47,8 +47,8 @@
/* RIG capabilities descriptions */
extern struct rig_caps gs100_caps;
extern struct rig_caps netrigctl_caps;
extern const struct rig_caps flrig_caps;
extern const struct rig_caps trxmanager_caps;
extern struct rig_caps flrig_caps;
extern struct rig_caps trxmanager_caps;
/*----------------------------------------------------------------------------*/

2
rigs/icmarine/icm700pro.c
Wyświetl plik

@ -49,7 +49,7 @@ static const struct icmarine_priv_caps icm700pro_priv_caps =
.default_remote_id = 2,
};
const struct rig_caps icm700pro_caps =
struct rig_caps icm700pro_caps =
{
RIG_MODEL(RIG_MODEL_IC_M700PRO),
.model_name = "IC-M700PRO",

4
rigs/icmarine/icm710.c
Wyświetl plik

@ -57,7 +57,7 @@ static const struct icm710_priv_caps icm710_priv_caps =
};
const struct rig_caps icm710_caps =
struct rig_caps icm710_caps =
{
RIG_MODEL(RIG_MODEL_IC_M710),
.model_name = "IC-M710",
@ -251,7 +251,7 @@ int icm710_init(RIG *rig)
{
struct icm710_priv_data *priv;
const struct icm710_priv_caps *priv_caps;
const struct rig_caps *caps;
struct rig_caps *caps;
if (!rig || !rig->caps)
{

6
rigs/icmarine/icm710.h
Wyświetl plik

@ -75,8 +75,8 @@ int icm710_set_conf(RIG *rig, token_t token, const char *val);
int icm710_get_conf(RIG *rig, token_t token, char *val);
int icm710_get_conf2(RIG *rig, token_t token, char *val, int val_len);
extern const struct rig_caps icm700pro_caps;
extern const struct rig_caps icm710_caps;
extern const struct rig_caps icm802_caps;
extern struct rig_caps icm700pro_caps;
extern struct rig_caps icm710_caps;
extern struct rig_caps icm802_caps;
#endif /* _ICM710_H */

2
rigs/icmarine/icm802.c
Wyświetl plik

@ -50,7 +50,7 @@ static const struct icmarine_priv_caps icm802_priv_caps =
};
const struct rig_caps icm802_caps =
struct rig_caps icm802_caps =
{
RIG_MODEL(RIG_MODEL_IC_M802),
.model_name = "IC-M802",

2
rigs/icmarine/icm803.c
Wyświetl plik

@ -50,7 +50,7 @@ static const struct icmarine_priv_caps icm803_priv_caps =
};
const struct rig_caps icm803_caps =
struct rig_caps icm803_caps =
{
RIG_MODEL(RIG_MODEL_IC_M803),
.model_name = "IC-M803",

2
rigs/icmarine/icmarine.c
Wyświetl plik

@ -113,7 +113,7 @@ int icmarine_init(RIG *rig)
{
struct icmarine_priv_data *priv;
const struct icmarine_priv_caps *priv_caps;
const struct rig_caps *caps;
struct rig_caps *caps;
if (!rig || !rig->caps)
{

8
rigs/icmarine/icmarine.h
Wyświetl plik

@ -65,9 +65,9 @@ int icmarine_set_conf(RIG *rig, token_t token, const char *val);
int icmarine_get_conf(RIG *rig, token_t token, char *val);
int icmarine_get_conf2(RIG *rig, token_t token, char *val, int val_len);
extern const struct rig_caps icm700pro_caps;
extern const struct rig_caps icm710_caps;
extern const struct rig_caps icm802_caps;
extern const struct rig_caps icm803_caps;
extern struct rig_caps icm700pro_caps;
extern struct rig_caps icm710_caps;
extern struct rig_caps icm802_caps;
extern struct rig_caps icm803_caps;
#endif /* _ICMARINE_H */

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

@ -52,7 +52,7 @@ static const struct icom_priv_caps delta2_priv_caps =
ic737_ts_sc_list /* TODO: ts_sc_list */
};
const struct rig_caps delta2_caps =
struct rig_caps delta2_caps =
{
RIG_MODEL(RIG_MODEL_DELTAII),
.model_name = "Delta II",

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

@ -40,7 +40,7 @@ static const struct icom_priv_caps ic1275_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic1275_caps =
struct rig_caps ic1275_caps =
{
RIG_MODEL(RIG_MODEL_IC1275),
.model_name = "IC-1275",

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

@ -49,7 +49,7 @@ static const struct icom_priv_caps ic271_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic271_caps =
struct rig_caps ic271_caps =
{
RIG_MODEL(RIG_MODEL_IC271),
.model_name = "IC-271",

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

@ -59,7 +59,7 @@ static const struct icom_priv_caps ic2730_priv_caps =
1, /* no XCHG */
};
const struct rig_caps ic2730_caps =
struct rig_caps ic2730_caps =
{
RIG_MODEL(RIG_MODEL_IC2730),
.model_name = "IC-2730",

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

@ -52,7 +52,7 @@ static const struct icom_priv_caps ic375_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic275_caps =
struct rig_caps ic275_caps =
{
RIG_MODEL(RIG_MODEL_IC275),
.model_name = "IC-275",
@ -151,7 +151,7 @@ const struct rig_caps ic275_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
const struct rig_caps ic375_caps =
struct rig_caps ic375_caps =
{
RIG_MODEL(RIG_MODEL_IC375),
.model_name = "IC-375",

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

@ -48,7 +48,7 @@ static const struct icom_priv_caps ic471_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic471_caps =
struct rig_caps ic471_caps =
{
RIG_MODEL(RIG_MODEL_IC471),
.model_name = "IC-471",

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

@ -44,7 +44,7 @@ static const struct icom_priv_caps ic475_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic475_caps =
struct rig_caps ic475_caps =
{
RIG_MODEL(RIG_MODEL_IC475),
.model_name = "IC-475",
@ -150,7 +150,7 @@ static const struct icom_priv_caps ic575_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic575_caps =
struct rig_caps ic575_caps =
{
RIG_MODEL(RIG_MODEL_IC575),
.model_name = "IC-575",

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

@ -190,7 +190,7 @@ static const struct icom_priv_caps IC7000_priv_caps =
.r2i_mode = ic7000_r2i_mode
};
const struct rig_caps ic7000_caps =
struct rig_caps ic7000_caps =
{
RIG_MODEL(RIG_MODEL_IC7000),
.model_name = "IC-7000",

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

@ -81,7 +81,7 @@ static const struct icom_priv_caps ic703_priv_caps =
ic706_ts_sc_list
};
const struct rig_caps ic703_caps =
struct rig_caps ic703_caps =
{
RIG_MODEL(RIG_MODEL_IC703),
.model_name = "IC-703",

6
rigs/icom/ic706.c
Wyświetl plik

@ -144,7 +144,7 @@ static const struct icom_priv_caps ic706_priv_caps =
.r2i_mode = ic706_r2i_mode
};
const struct rig_caps ic706_caps =
struct rig_caps ic706_caps =
{
RIG_MODEL(RIG_MODEL_IC706),
.model_name = "IC-706",
@ -292,7 +292,7 @@ static const struct icom_priv_caps ic706mkii_priv_caps =
.r2i_mode = ic706_r2i_mode
};
const struct rig_caps ic706mkii_caps =
struct rig_caps ic706mkii_caps =
{
RIG_MODEL(RIG_MODEL_IC706MKII),
.model_name = "IC-706MkII",
@ -463,7 +463,7 @@ static const struct icom_priv_caps ic706mkiig_priv_caps =
.r2i_mode = ic706_r2i_mode
};
const struct rig_caps ic706mkiig_caps =
struct rig_caps ic706mkiig_caps =
{
RIG_MODEL(RIG_MODEL_IC706MKIIG),
.model_name = "IC-706MkIIG",

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

@ -54,7 +54,7 @@ static const struct icom_priv_caps ic707_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic707_caps =
struct rig_caps ic707_caps =
{
RIG_MODEL(RIG_MODEL_IC707),
.model_name = "IC-707",

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

@ -311,7 +311,7 @@ int ic7100_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,
return retval;
}
const struct rig_caps ic7100_caps =
struct rig_caps ic7100_caps =
{
RIG_MODEL(RIG_MODEL_IC7100),
.model_name = "IC-7100",

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

@ -72,7 +72,7 @@ static const struct icom_priv_caps IC718_priv_caps =
ic718_ts_sc_list
};
const struct rig_caps ic718_caps =
struct rig_caps ic718_caps =
{
RIG_MODEL(RIG_MODEL_IC718),
.model_name = "IC-718",

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

@ -118,7 +118,7 @@ static const struct icom_priv_caps IC7200_priv_caps =
},
};
const struct rig_caps ic7200_caps =
struct rig_caps ic7200_caps =
{
RIG_MODEL(RIG_MODEL_IC7200),
.model_name = "IC-7200",

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

@ -52,7 +52,7 @@ static const struct icom_priv_caps ic725_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic725_caps =
struct rig_caps ic725_caps =
{
RIG_MODEL(RIG_MODEL_IC725),
.model_name = "IC-725",

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

@ -54,7 +54,7 @@ static const struct icom_priv_caps ic726_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic726_caps =
struct rig_caps ic726_caps =
{
RIG_MODEL(RIG_MODEL_IC726),
.model_name = "IC-726",

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

@ -54,7 +54,7 @@ static const struct icom_priv_caps ic728_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic728_caps =
struct rig_caps ic728_caps =
{
RIG_MODEL(RIG_MODEL_IC728),
.model_name = "IC-728",
@ -173,7 +173,7 @@ static const struct icom_priv_caps ic729_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic729_caps =
struct rig_caps ic729_caps =
{
RIG_MODEL(RIG_MODEL_IC729),
.model_name = "IC-729",

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

@ -689,7 +689,7 @@ static const struct icom_priv_caps IC905_priv_caps =
.extcmds = ic705_extcmds, /* Custom parameters */
};
const struct rig_caps ic7300_caps =
struct rig_caps ic7300_caps =
{
RIG_MODEL(RIG_MODEL_IC7300),
.model_name = "IC-7300",
@ -1262,7 +1262,7 @@ struct rig_caps ic9700_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
const struct rig_caps ic705_caps =
struct rig_caps ic705_caps =
{
RIG_MODEL(RIG_MODEL_IC705),
.model_name = "IC-705",
@ -1537,7 +1537,7 @@ const struct rig_caps ic705_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
const struct rig_caps ic905_caps =
struct rig_caps ic905_caps =
{
RIG_MODEL(RIG_MODEL_IC905),
.model_name = "IC-905",

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

@ -51,7 +51,7 @@ static const struct icom_priv_caps ic735_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic735_caps =
struct rig_caps ic735_caps =
{
RIG_MODEL(RIG_MODEL_IC735),
.model_name = "IC-735",

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

@ -58,7 +58,7 @@ static const struct icom_priv_caps ic736_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic736_caps =
struct rig_caps ic736_caps =
{
RIG_MODEL(RIG_MODEL_IC736),
.model_name = "IC-736",

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

@ -56,7 +56,7 @@ static const struct icom_priv_caps ic737_priv_caps =
.ant_count = 2
};
const struct rig_caps ic737_caps =
struct rig_caps ic737_caps =
{
RIG_MODEL(RIG_MODEL_IC737),
.model_name = "IC-737",

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

@ -58,7 +58,7 @@ static const struct icom_priv_caps ic738_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic738_caps =
struct rig_caps ic738_caps =
{
RIG_MODEL(RIG_MODEL_IC738),
.model_name = "IC-738",

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

@ -118,7 +118,7 @@ static const struct icom_priv_caps ic7410_priv_caps =
};
const struct rig_caps ic7410_caps =
struct rig_caps ic7410_caps =
{
RIG_MODEL(RIG_MODEL_IC7410),
.model_name = "IC-7410",

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

@ -176,7 +176,7 @@ static const struct icom_priv_caps ic746_priv_caps =
},
};
const struct rig_caps ic746_caps =
struct rig_caps ic746_caps =
{
RIG_MODEL(RIG_MODEL_IC746),
.model_name = "IC-746",
@ -412,7 +412,7 @@ static const struct icom_priv_caps ic746pro_priv_caps =
},
};
const struct rig_caps ic746pro_caps =
struct rig_caps ic746pro_caps =
{
RIG_MODEL(RIG_MODEL_IC746PRO),
.model_name = "IC-746PRO",

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

@ -79,7 +79,7 @@ static const struct icom_priv_caps ic751_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic751_caps =
struct rig_caps ic751_caps =
{
RIG_MODEL(RIG_MODEL_IC751),
.model_name = "IC-751",

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

@ -135,7 +135,7 @@ static const struct icom_priv_caps ic756_priv_caps =
},
};
const struct rig_caps ic756_caps =
struct rig_caps ic756_caps =
{
RIG_MODEL(RIG_MODEL_IC756),
.model_name = "IC-756",
@ -300,7 +300,7 @@ static const struct icom_priv_caps ic756pro_priv_caps =
},
};
const struct rig_caps ic756pro_caps =
struct rig_caps ic756pro_caps =
{
RIG_MODEL(RIG_MODEL_IC756PRO),
.model_name = "IC-756PRO",
@ -541,7 +541,7 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val);
#define IC756PROII_PARMS (RIG_PARM_ANN|RIG_PARM_BEEP|RIG_PARM_BACKLIGHT|RIG_PARM_TIME)
const struct rig_caps ic756pro2_caps =
struct rig_caps ic756pro2_caps =
{
RIG_MODEL(RIG_MODEL_IC756PROII),
.model_name = "IC-756PROII",
@ -977,7 +977,7 @@ static const struct icom_priv_caps ic756pro3_priv_caps =
{ 241, 30.0f } \
} }
const struct rig_caps ic756pro3_caps =
struct rig_caps ic756pro3_caps =
{
RIG_MODEL(RIG_MODEL_IC756PROIII),
.model_name = "IC-756PROIII",

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

@ -51,7 +51,7 @@ static const struct icom_priv_caps ic761_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic761_caps =
struct rig_caps ic761_caps =
{
RIG_MODEL(RIG_MODEL_IC761),
.model_name = "IC-761",

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

@ -54,7 +54,7 @@ static const struct icom_priv_caps ic765_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic765_caps =
struct rig_caps ic765_caps =
{
RIG_MODEL(RIG_MODEL_IC765),
.model_name = "IC-765",

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

@ -253,7 +253,7 @@ int ic7700_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,
return retval;
}
const struct rig_caps ic7700_caps =
struct rig_caps ic7700_caps =
{
RIG_MODEL(RIG_MODEL_IC7700),
.model_name = "IC-7700",

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

@ -51,7 +51,7 @@ static const struct icom_priv_caps ic775_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic775_caps =
struct rig_caps ic775_caps =
{
RIG_MODEL(RIG_MODEL_IC775),
.model_name = "IC-775",

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

@ -62,7 +62,7 @@ static const struct icom_priv_caps ic78_priv_caps =
ic706_ts_sc_list
};
const struct rig_caps ic78_caps =
struct rig_caps ic78_caps =
{
RIG_MODEL(RIG_MODEL_IC78),
.model_name = "IC-78",

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

@ -153,7 +153,7 @@ static const struct icom_priv_caps ic7800_priv_caps =
.extcmds = ic7800_extcmds,
};
const struct rig_caps ic7800_caps =
struct rig_caps ic7800_caps =
{
RIG_MODEL(RIG_MODEL_IC7800),
.model_name = "IC-7800",

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

@ -55,7 +55,7 @@ static const struct icom_priv_caps ic781_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic781_caps =
struct rig_caps ic781_caps =
{
RIG_MODEL(RIG_MODEL_IC781),
.model_name = "IC-781",

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

@ -238,7 +238,7 @@ static struct icom_priv_caps ic785x_priv_caps =
.x25_always = 1,
};
const struct rig_caps ic785x_caps =
struct rig_caps ic785x_caps =
{
RIG_MODEL(RIG_MODEL_IC785x),
.model_name = "IC-7850/7851",

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

@ -50,7 +50,7 @@ static const struct icom_priv_caps ic820h_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic820h_caps =
struct rig_caps ic820h_caps =
{
RIG_MODEL(RIG_MODEL_IC820),
.model_name = "IC-820H",

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

@ -88,7 +88,7 @@ int ic821h_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
RETURNFUNC(retval);
}
const struct rig_caps ic821h_caps =
struct rig_caps ic821h_caps =
{
RIG_MODEL(RIG_MODEL_IC821H),
.model_name = "IC-821H",

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

@ -196,7 +196,7 @@ int ic910_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
}
const struct rig_caps ic910_caps =
struct rig_caps ic910_caps =
{
RIG_MODEL(RIG_MODEL_IC910),
.model_name = "IC-910",

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

@ -104,7 +104,7 @@ static const struct icom_priv_caps ic9100_priv_caps =
.extcmds = ic9100_extcmds,
};
const struct rig_caps ic9100_caps =
struct rig_caps ic9100_caps =
{
RIG_MODEL(RIG_MODEL_IC9100),
.model_name = "IC-9100",

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

@ -93,7 +93,7 @@ static const struct icom_priv_caps ic92d_priv_caps =
.serial_full_duplex = 1
};
const struct rig_caps ic92d_caps =
struct rig_caps ic92d_caps =
{
RIG_MODEL(RIG_MODEL_IC92D),
.model_name = "IC-92D", /* IC-E92D/IC-92AD */

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

@ -45,7 +45,7 @@ static const struct icom_priv_caps ic970_priv_caps =
ic737_ts_sc_list
};
const struct rig_caps ic970_caps =
struct rig_caps ic970_caps =
{
RIG_MODEL(RIG_MODEL_IC970),
.model_name = "IC-970",

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

@ -380,7 +380,7 @@ int icf8101_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
}
const struct rig_caps icf8101_caps =
struct rig_caps icf8101_caps =
{
RIG_MODEL(RIG_MODEL_ICF8101),
.model_name = "IC-F8101",

17
rigs/icom/icom.c
Wyświetl plik

@ -973,7 +973,7 @@ static void icom_satmode_fix(RIG *rig, int satmode)
int
icom_rig_open(RIG *rig)
{
int retval, retval_echo;
int retval, retval_echo, value;
int satmode = 0;
struct rig_state *rs = &rig->state;
struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
@ -1017,6 +1017,14 @@ retry_open:
if (retval == RIG_OK) // then we know our echo status
{
// we need to know about dual watch for later use
rs->dual_watch = 0;
retval = rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH, &value);
if (retval == RIG_OK) {
rs->dual_watch = value;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: dual_watch=%d\n", __func__, rs->dual_watch);
rig_debug(RIG_DEBUG_TRACE, "%s: echo status known, getting frequency\n",
__func__);
rs->rigport.retry = 0;
@ -1120,6 +1128,7 @@ retry_open:
#endif
rs->rigport.retry = retry_save;
RETURNFUNC(RIG_OK);
}
@ -1173,6 +1182,7 @@ static int icom_set_default_vfo(RIG *rig)
rig_debug(RIG_DEBUG_TRACE, "%s: called, curr_vfo=%s\n", __func__,
rig_strvfo(rig->state.current_vfo));
// we need to know if dual watch is on
if (VFO_HAS_MAIN_SUB_A_B_ONLY)
{
rig_debug(RIG_DEBUG_TRACE, "%s: setting default as MAIN/VFOA\n",
@ -1385,8 +1395,10 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
cmd = C_SET_FREQ;
subcmd = -1;
if (ICOM_IS_ID5100 || ICOM_IS_ID4100 || ICOM_IS_ID31 || ICOM_IS_ID51)
#if 0
if (rig->state.cache.ptt && (ICOM_IS_ID5100 || ICOM_IS_ID4100 || ICOM_IS_ID31 || ICOM_IS_ID51))
{
rig_debug(RIG_DEBUG_TRACE, "%s(%d): ID55100 0x00\n", __func__, __LINE__);
// for these rigs 0x00 is setting the freq and 0x03 is just for reading
cmd = 0x00;
// temporary fix for ID5100 not giving ACK/NAK on 0x00 freq on E8 firmware
@ -1400,6 +1412,7 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
return RIG_OK;
}
else
#endif
{
retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, ackbuf,
&ack_len);

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

@ -279,7 +279,7 @@ struct icom_priv_data
struct icom_spectrum_scope_cache spectrum_scope_cache[HAMLIB_MAX_SPECTRUM_SCOPES]; /*!< Cached Icom spectrum scope data used during reception of the data. The array index must match the scope ID. */
freq_t other_freq; /*!< Our other freq depending on which vfo is selected */
int vfo_flag; // used to skip vfo check when frequencies are equal
int dual_watch; // dual watch mode on status
int dual_watch_main_sub; // 0=main, 1=sub
};
extern const struct ts_sc_list r8500_ts_sc_list[];
@ -422,94 +422,94 @@ extern const struct confparams icom_ext_funcs[];
extern const struct confparams icom_ext_parms[];
extern const struct cmdparams icom_ext_cmds[];
extern const struct rig_caps ic703_caps;
extern const struct rig_caps ic705_caps;
extern const struct rig_caps ic706_caps;
extern const struct rig_caps ic706mkii_caps;
extern const struct rig_caps ic706mkiig_caps;
extern const struct rig_caps ic707_caps;
extern const struct rig_caps ic718_caps;
extern const struct rig_caps ic725_caps;
extern const struct rig_caps ic726_caps;
extern const struct rig_caps ic728_caps;
extern const struct rig_caps ic729_caps;
extern const struct rig_caps ic735_caps;
extern const struct rig_caps ic736_caps;
extern const struct rig_caps ic737_caps;
extern const struct rig_caps ic738_caps;
extern const struct rig_caps ic746_caps;
extern const struct rig_caps ic7410_caps;
extern const struct rig_caps ic746pro_caps;
extern const struct rig_caps ic756_caps;
extern const struct rig_caps ic756pro_caps;
extern const struct rig_caps ic756pro2_caps;
extern const struct rig_caps ic756pro3_caps;
extern const struct rig_caps ic751_caps;
extern struct rig_caps ic703_caps;
extern struct rig_caps ic705_caps;
extern struct rig_caps ic706_caps;
extern struct rig_caps ic706mkii_caps;
extern struct rig_caps ic706mkiig_caps;
extern struct rig_caps ic707_caps;
extern struct rig_caps ic718_caps;
extern struct rig_caps ic725_caps;
extern struct rig_caps ic726_caps;
extern struct rig_caps ic728_caps;
extern struct rig_caps ic729_caps;
extern struct rig_caps ic735_caps;
extern struct rig_caps ic736_caps;
extern struct rig_caps ic737_caps;
extern struct rig_caps ic738_caps;
extern struct rig_caps ic746_caps;
extern struct rig_caps ic7410_caps;
extern struct rig_caps ic746pro_caps;
extern struct rig_caps ic756_caps;
extern struct rig_caps ic756pro_caps;
extern struct rig_caps ic756pro2_caps;
extern struct rig_caps ic756pro3_caps;
extern struct rig_caps ic751_caps;
extern struct rig_caps ic7600_caps; // need to modify targetable_vfo depending on response to 0x25 cmd
extern struct rig_caps ic7610_caps;
extern const struct rig_caps ic761_caps;
extern const struct rig_caps ic765_caps;
extern const struct rig_caps ic7700_caps;
extern const struct rig_caps ic775_caps;
extern const struct rig_caps ic78_caps;
extern const struct rig_caps ic7800_caps;
extern const struct rig_caps ic785x_caps;
extern const struct rig_caps ic7000_caps;
extern const struct rig_caps ic7100_caps;
extern const struct rig_caps ic7200_caps;
extern const struct rig_caps ic7300_caps;
extern const struct rig_caps ic781_caps;
extern const struct rig_caps ic820h_caps;
extern const struct rig_caps ic821h_caps;
extern const struct rig_caps ic905_caps;
extern const struct rig_caps ic910_caps;
extern const struct rig_caps ic9100_caps;
extern const struct rig_caps ic970_caps;
extern struct rig_caps ic761_caps;
extern struct rig_caps ic765_caps;
extern struct rig_caps ic7700_caps;
extern struct rig_caps ic775_caps;
extern struct rig_caps ic78_caps;
extern struct rig_caps ic7800_caps;
extern struct rig_caps ic785x_caps;
extern struct rig_caps ic7000_caps;
extern struct rig_caps ic7100_caps;
extern struct rig_caps ic7200_caps;
extern struct rig_caps ic7300_caps;
extern struct rig_caps ic781_caps;
extern struct rig_caps ic820h_caps;
extern struct rig_caps ic821h_caps;
extern struct rig_caps ic905_caps;
extern struct rig_caps ic910_caps;
extern struct rig_caps ic9100_caps;
extern struct rig_caps ic970_caps;
extern struct rig_caps ic9700_caps;
extern const struct rig_caps icrx7_caps;
extern const struct rig_caps icr10_caps;
extern const struct rig_caps icr20_caps;
extern const struct rig_caps icr6_caps;
extern const struct rig_caps icr71_caps;
extern const struct rig_caps icr72_caps;
extern const struct rig_caps icr75_caps;
extern const struct rig_caps icr7000_caps;
extern const struct rig_caps icr7100_caps;
extern const struct rig_caps icr8500_caps;
extern const struct rig_caps icr9000_caps;
extern const struct rig_caps icr9500_caps;
extern const struct rig_caps ic271_caps;
extern const struct rig_caps ic275_caps;
extern const struct rig_caps ic375_caps;
extern const struct rig_caps ic471_caps;
extern const struct rig_caps ic475_caps;
extern const struct rig_caps ic575_caps;
extern const struct rig_caps ic1275_caps;
extern const struct rig_caps icf8101_caps;
extern struct rig_caps icrx7_caps;
extern struct rig_caps icr10_caps;
extern struct rig_caps icr20_caps;
extern struct rig_caps icr6_caps;
extern struct rig_caps icr71_caps;
extern struct rig_caps icr72_caps;
extern struct rig_caps icr75_caps;
extern struct rig_caps icr7000_caps;
extern struct rig_caps icr7100_caps;
extern struct rig_caps icr8500_caps;
extern struct rig_caps icr9000_caps;
extern struct rig_caps icr9500_caps;
extern struct rig_caps ic271_caps;
extern struct rig_caps ic275_caps;
extern struct rig_caps ic375_caps;
extern struct rig_caps ic471_caps;
extern struct rig_caps ic475_caps;
extern struct rig_caps ic575_caps;
extern struct rig_caps ic1275_caps;
extern struct rig_caps icf8101_caps;
extern const struct rig_caps omnivip_caps;
extern const struct rig_caps delta2_caps;
extern struct rig_caps omnivip_caps;
extern struct rig_caps delta2_caps;
extern const struct rig_caps os456_caps;
extern const struct rig_caps os535_caps;
extern struct rig_caps os456_caps;
extern struct rig_caps os535_caps;
extern const struct rig_caps ic92d_caps;
extern const struct rig_caps id1_caps;
extern const struct rig_caps id31_caps;
extern const struct rig_caps id51_caps;
extern const struct rig_caps id4100_caps;
extern const struct rig_caps id5100_caps;
extern const struct rig_caps ic2730_caps;
extern struct rig_caps ic92d_caps;
extern struct rig_caps id1_caps;
extern struct rig_caps id31_caps;
extern struct rig_caps id51_caps;
extern struct rig_caps id4100_caps;
extern struct rig_caps id5100_caps;
extern struct rig_caps ic2730_caps;
extern const struct rig_caps perseus_caps;
extern struct rig_caps perseus_caps;
extern const struct rig_caps x108g_caps;
extern const struct rig_caps x6100_caps;
extern const struct rig_caps g90_caps;
extern const struct rig_caps x5105_caps;
extern struct rig_caps x108g_caps;
extern struct rig_caps x6100_caps;
extern struct rig_caps g90_caps;
extern struct rig_caps x5105_caps;
extern const struct rig_caps icr8600_caps;
extern const struct rig_caps icr30_caps;
extern struct rig_caps icr8600_caps;
extern struct rig_caps icr30_caps;
#define RIG_IS_IC1271 (rig->state.rig_model == RIG_MODEL_IC1271)
#define RIG_IS_IC1275 (rig->state.rig_model == RIG_MODEL_IC1275)

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

@ -51,7 +51,7 @@ static struct icom_priv_caps icr10_priv_caps =
r8500_ts_sc_list /* wrong, but don't have set_ts anyway */
};
const struct rig_caps icr10_caps =
struct rig_caps icr10_caps =
{
RIG_MODEL(RIG_MODEL_ICR10),
.model_name = "IC-R10",

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

@ -51,7 +51,7 @@ static struct icom_priv_caps icr20_priv_caps =
r8500_ts_sc_list /* wrong, but don't have set_ts anyway */
};
const struct rig_caps icr20_caps =
struct rig_caps icr20_caps =
{
RIG_MODEL(RIG_MODEL_ICR20),
.model_name = "IC-R20",

Some files were not shown because too many files have changed in this diff Show More