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

fix merge conflicts

pull/179/head
Malcolm Herring 2020-01-05 08:17:46 +00:00
rodzic 11492d3ece 0d02109483
commit f497f503d7
6 zmienionych plików z 1108 dodań i 792 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
icom/ic706.c
Wyświetl plik

@ -144,6 +144,7 @@ static const struct icom_priv_caps ic706_priv_caps =
0, /* 731 mode */
0, /* no XCHG */
ic706_ts_sc_list,
.serial_USB_echo_check = 1, /* USB CI-V may not echo */
.r2i_mode = ic706_r2i_mode
};
@ -152,7 +153,7 @@ const struct rig_caps ic706_caps =
.rig_model = RIG_MODEL_IC706,
.model_name = "IC-706",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_MOBILE,
@ -249,7 +250,7 @@ const struct rig_caps ic706_caps =
.priv = (void *)& ic706_priv_caps,
.rig_init = icom_init,
.rig_cleanup = icom_cleanup,
.rig_open = NULL,
.rig_open = icom_rig_open,
.rig_close = NULL,
.set_freq = icom_set_freq,
@ -281,6 +282,7 @@ static const struct icom_priv_caps ic706mkii_priv_caps =
0, /* 731 mode */
0, /* no XCHG */
ic706_ts_sc_list,
.serial_USB_echo_check = 1, /* USB CI-V may not echo */
.r2i_mode = ic706_r2i_mode
};
@ -289,7 +291,7 @@ const struct rig_caps ic706mkii_caps =
.rig_model = RIG_MODEL_IC706MKII,
.model_name = "IC-706MkII",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
.version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_MOBILE,
@ -390,7 +392,7 @@ const struct rig_caps ic706mkii_caps =
.priv = (void *)& ic706mkii_priv_caps,
.rig_init = icom_init,
.rig_cleanup = icom_cleanup,
.rig_open = NULL,
.rig_open = icom_rig_open,
.rig_close = NULL,
.set_freq = icom_set_freq,
@ -442,6 +444,7 @@ static const struct icom_priv_caps ic706mkiig_priv_caps =
0, /* 731 mode */
0, /* no XCHG */
ic706_ts_sc_list,
.serial_USB_echo_check = 1, /* USB CI-V may not echo */
.r2i_mode = ic706_r2i_mode
};
@ -450,7 +453,7 @@ const struct rig_caps ic706mkiig_caps =
.rig_model = RIG_MODEL_IC706MKIIG,
.model_name = "IC-706MkIIG",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
.version = BACKEND_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_MOBILE,
@ -579,7 +582,7 @@ const struct rig_caps ic706mkiig_caps =
.priv = (void *)& ic706mkiig_priv_caps,
.rig_init = icom_init,
.rig_cleanup = icom_cleanup,
.rig_open = NULL,
.rig_open = icom_rig_open,
.rig_close = NULL,
.set_freq = icom_set_freq,

8
icom/ic7610.c
Wyświetl plik

@ -166,15 +166,15 @@ const struct rig_caps ic7610_caps =
.rig_model = RIG_MODEL_IC7610,
.model_name = "IC-7610",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_UNTESTED,
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG,
.port_type = RIG_PORT_SERIAL,
.serial_rate_min = 300,
.serial_rate_max = 19200,
.serial_rate_max = 115200,
.serial_data_bits = 8,
.serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE,
@ -289,7 +289,7 @@ const struct rig_caps ic7610_caps =
.priv = (void *)& ic7610_priv_caps,
.rig_init = icom_init,
.rig_cleanup = icom_cleanup,
.rig_open = NULL,
.rig_open = icom_rig_open,
.rig_close = NULL,
.set_freq = icom_set_freq,

1871
icom/icom.c
Wyświetl plik

Plik diff jest za duży Load Diff

2
icom/icom.h
Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "0.18a"
#define BACKEND_VER "0.19"
/*
* defines used by comp_cal_str in rig.c

2
tests/rigctl_parse.c
Wyświetl plik

@ -1003,8 +1003,6 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
}
#ifdef HAVE_LIBREADLINE
rig_debug(RIG_DEBUG_TRACE, "%s: debug15\n", __func__);
if (interactive && prompt && have_rl)
{
int j, x;

2
yaesu/ft991.c
Wyświetl plik

@ -352,7 +352,7 @@ int ft991_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode,
return err;
}
strncpy(restore_commands, priv->ret_data, NEWCAT_DATA_LEN);
strncat(restore_commands, priv->ret_data, NEWCAT_DATA_LEN-1);
/* Change mode on VFOA */
if (RIG_OK != (err = newcat_set_mode(rig, RIG_VFO_A, tx_mode,