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

Merge branch 'nate-tmp'

Hamlib-1.2.15
Nate Bargmann 2011-09-04 10:23:27 -05:00
rodzic 6699942722 96b1460e24
commit 150231108d
32 zmienionych plików z 137 dodań i 143 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
aor/ar5000.c
Wyświetl plik

@ -403,7 +403,6 @@ int format5k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
case RIG_MODE_WFM:
case RIG_MODE_FM: aormode = AR5K_FM; break;
case RIG_MODE_LSB: aormode = AR5K_LSB; break;
case RIG_MODE_SSB:
case RIG_MODE_USB: aormode = AR5K_USB; break;
case RIG_MODE_CW: aormode = AR5K_CW; break;
case RIG_MODE_SAM: aormode = AR5K_SAM; break;

8
aor/ar7030.c
Wyświetl plik

@ -83,7 +83,11 @@ static int rxr_readByte(RIG *rig)
unsigned char buf[] = {0x71}; // Read command
int retval;
retval = write_block(&rig->state.rigport, (char *) buf, 1);
if (retval != RIG_OK)
return retval;
retval = read_block(&rig->state.rigport, (char *) response, 1);
if (retval != RIG_OK)
return retval;
return response[0];
}
@ -258,7 +262,11 @@ static int Execute_Routine_14(RIG *rig)
unsigned char buf[] = {0x2e}; // Read command
int retval;
retval = write_block(&rig->state.rigport, (char *) buf, 1);
if (retval != RIG_OK)
return retval;
retval = read_block(&rig->state.rigport, (char *) response, 1);
if (retval != RIG_OK)
return retval;
return response[0];
}

3
dummy/netrigctl.c
Wyświetl plik

@ -72,7 +72,6 @@ static int netrigctl_open(RIG *rig)
{
int ret, len, i;
struct rig_state *rs = &rig->state;
rig_model_t model;
int prot_ver;
char cmd[CMD_MAX];
char buf[BUF_MAX];
@ -95,8 +94,6 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
model = atoi(buf);
ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", sizeof("\n"));
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;

3
dummy/netrotctl.c
Wyświetl plik

@ -63,7 +63,6 @@ static int netrotctl_open(ROT *rot)
{
int ret, len;
struct rot_state *rs = &rot->state;
rot_model_t model;
int prot_ver;
char cmd[CMD_MAX];
char buf[BUF_MAX];
@ -86,8 +85,6 @@ static int netrotctl_open(ROT *rot)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
model = atoi(buf);
ret = read_string(&rot->state.rotport, buf, BUF_MAX, "\n", sizeof("\n"));
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;

10
icom/ic746.c
Wyświetl plik

@ -549,8 +549,6 @@ const struct rig_caps ic746pro_caps = {
*/
static int ic746pro_set_ext_parm(RIG *rig, token_t token, value_t val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char epbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int ack_len, ep_len, val_len;
int ep_cmd = C_CTL_MEM;
@ -558,9 +556,6 @@ static int ic746pro_set_ext_parm(RIG *rig, token_t token, value_t val)
int icom_val = 0;
int retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
ep_len = 0; /* 0 implies BCD data */
val_len = 1;
@ -607,8 +602,6 @@ static int ic746pro_set_ext_parm(RIG *rig, token_t token, value_t val)
*/
static int ic746pro_get_ext_parm(RIG *rig, token_t token, value_t *val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
const struct confparams *cfp;
unsigned char resbuf[MAXFRAMELEN];
@ -619,9 +612,6 @@ static int ic746pro_get_ext_parm(RIG *rig, token_t token, value_t *val)
int ep_cmd = C_CTL_MEM;
int ep_sc; /* Subcommand in $1A $05xx */
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
switch(token) {
case TOK_SSBBASS:
ep_sc = S_MEM_SBASS ;

10
icom/ic756.c
Wyświetl plik

@ -582,8 +582,6 @@ const struct rig_caps ic756pro2_caps = {
*/
static int ic756pro2_set_ext_parm(RIG *rig, token_t token, value_t val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char epbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int ack_len, ep_len, val_len;
int ep_cmd = C_CTL_MEM;
@ -591,9 +589,6 @@ static int ic756pro2_set_ext_parm(RIG *rig, token_t token, value_t val)
int icom_val = 0;
int retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
ep_len = 0; /* 0 implies BCD data */
val_len = 1;
@ -651,8 +646,6 @@ static int ic756pro2_set_ext_parm(RIG *rig, token_t token, value_t val)
*/
static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
const struct confparams *cfp;
unsigned char resbuf[MAXFRAMELEN];
@ -663,9 +656,6 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val)
int ep_cmd = C_CTL_MEM;
int ep_sc; /* Subcommand in $1A $05xx */
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
switch(token) {
case TOK_SSBBASS:
ep_sc = S_MEM_SBASS ;

13
icom/icom.c
Wyświetl plik

@ -663,14 +663,9 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/
int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char modebuf[MAXFRAMELEN];
int mode_len, retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
retval = icom_transaction (rig, C_RD_MODE, -1, NULL, 0,
modebuf, &mode_len);
if (retval != RIG_OK)
@ -769,7 +764,6 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
*/
int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char lvlbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int ack_len=sizeof(ackbuf), lvl_len;
@ -778,7 +772,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
int i, retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
/*
@ -981,7 +974,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
*/
int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char lvlbuf[MAXFRAMELEN], lvl2buf[MAXFRAMELEN];
int lvl_len, lvl2_len;
@ -991,7 +983,6 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
lvl2_len = 0;
@ -2821,15 +2812,11 @@ int icom_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
*/
int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char scanbuf[MAXFRAMELEN];
unsigned char ackbuf[MAXFRAMELEN];
int scan_len, ack_len=sizeof(ackbuf), retval;
int scan_cn, scan_sc;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
scan_len = 0;
scan_cn = C_CTL_SCAN;

35
icom/optoscan.c
Wyświetl plik

@ -137,15 +137,10 @@ int optoscan_close(RIG *rig)
*/
const char* optoscan_get_info(RIG *rig)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char ackbuf[16];
int ack_len, retval;
static char info[64];
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
/* select LOCAL control */
retval = icom_transaction (rig, C_CTL_MISC, S_OPTO_RDID,
NULL, 0, ackbuf, &ack_len);
@ -173,12 +168,9 @@ const char* optoscan_get_info(RIG *rig)
*/
int optoscan_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
{
const struct rig_caps *caps;
unsigned char tonebuf[MAXFRAMELEN];
int tone_len, retval;
caps = rig->caps;
retval = icom_transaction(rig, C_CTL_MISC, S_OPTO_RDCTCSS, NULL, 0,
tonebuf, &tone_len);
if (retval != RIG_OK)
@ -205,12 +197,9 @@ int optoscan_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
*/
int optoscan_get_dcs_code(RIG * rig, vfo_t vfo, tone_t *code)
{
const struct rig_caps *caps;
unsigned char tonebuf[MAXFRAMELEN];
int tone_len, retval;
caps = rig->caps;
retval = icom_transaction(rig, C_CTL_MISC, S_OPTO_RDDCS, NULL, 0,
tonebuf, &tone_len);
if (retval != RIG_OK)
@ -232,13 +221,11 @@ int optoscan_get_dcs_code(RIG * rig, vfo_t vfo, tone_t *code)
int optoscan_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
{
const struct rig_caps *caps;
unsigned char dtmfbuf[MAXFRAMELEN],digit;
int len, retval, digitpos;
unsigned char xlate[] = {'0','1','2','3','4','5','6',
'7','8','9','A','B','C','D',
'*','#'};
caps = rig->caps;
digitpos=0;
do {
@ -282,14 +269,12 @@ int optoscan_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
int optoscan_set_ext_parm(RIG *rig, token_t token, value_t val)
{
unsigned char epbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int ack_len, val_len;
int ack_len;
int retval,subcode;
memset(epbuf,0,MAXFRAMELEN);
memset(ackbuf,0,MAXFRAMELEN);
val_len = 1;
switch(token) {
case TOK_TAPECNTL:
if( val.i == 0 ) {
@ -385,17 +370,12 @@ int optoscan_get_ext_parm(RIG *rig, token_t token, value_t *val)
*/
int optoscan_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char lvlbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN];
int ack_len;
int lvl_cn, lvl_sc; /* Command Number, Subcommand */
int icom_val;
int retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
memset(lvlbuf,0,MAXFRAMELEN);
/*
@ -442,8 +422,6 @@ int optoscan_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
int optoscan_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
struct optostat status_block;
struct icom_priv_data *priv;
struct rig_state *rs;
unsigned char lvlbuf[MAXFRAMELEN];
int lvl_len;
int lvl_cn, lvl_sc; /* Command Number, Subcommand */
@ -451,9 +429,6 @@ int optoscan_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int cmdhead;
int retval;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
if( level != RIG_LEVEL_AF )
{
switch (level) {
@ -674,18 +649,10 @@ static int optoscan_get_status_block(RIG *rig, struct optostat *status_block)
static int optoscan_send_freq(RIG *rig,pltstate_t *state)
{
unsigned char buff[OPTO_BUFF_SIZE];
struct icom_priv_data *priv;
struct rig_state *rs;
const hamlib_port_t *port;
int fd;
char md,pd;
freq_t freq;
rmode_t mode;
port = &(rig->state.rigport);
fd = port->fd;
rs = &rig->state;
priv = (struct icom_priv_data*)rs->priv;
freq=state->next_freq;
mode=state->next_mode;

9
kenwood/ic10.c
Wyświetl plik

@ -661,7 +661,11 @@ int ic10_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
int cmdlen, fct_len, ack_len;
switch (func) {
case RIG_FUNC_LOCK: cmdlen = sprintf(cmdbuf,"LK"); break;
case RIG_FUNC_LOCK:
cmdlen = sprintf(cmdbuf,"LK");
if (cmdlen < 0)
return -RIG_ETRUNC;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_func %#x",
__func__,func);
@ -669,6 +673,9 @@ int ic10_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
}
fct_len = sprintf(fctbuf,"%s%c;", cmdbuf, status==0?'0':'1');
if (fct_len < 0)
return -RIG_ETRUNC;
return ic10_transaction (rig, fctbuf, fct_len, ackbuf, &ack_len);
return RIG_OK;

3
kenwood/th.c
Wyświetl plik

@ -1063,7 +1063,6 @@ th_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int th_set_level (RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char vch, buf[12];
size_t ack_len;
vfo_t tvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
@ -1083,8 +1082,6 @@ int th_set_level (RIG *rig, vfo_t vfo, setting_t level, value_t val)
return kenwood_wrong_vfo(__func__, vfo);
}
ack_len = ACKBUF_LEN;
switch (level) {
case RIG_LEVEL_RFPOWER :

3
kenwood/tmv7.c
Wyświetl plik

@ -554,9 +554,8 @@ int tmv7_set_channel(RIG *rig, const channel_t *chan)
size_t ack_len;
char req[64];
long freq;
int chn, step, shift, tone, ctcss, tonefq, ctcssfq;
int step, shift, tone, ctcss, tonefq, ctcssfq;
chn=chan->channel_num;
freq=(long)chan->freq;
for(step=0; rig->state.tuning_steps[step].ts!=0;step++)

61
kenwood/ts570.c
Wyświetl plik

@ -453,6 +453,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set RX VFO */
cmd_len = sprintf(cmdbuf, "FR%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -470,6 +473,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set TX VFO */
cmd_len = sprintf(cmdbuf, "FT%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -485,6 +491,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
/* and then set it to both vfo's */
vfo_function = ackbuf[2];
cmd_len = sprintf(cmdbuf, "FT%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -511,7 +520,7 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
int retval, cmd_len;
size_t mem_len;
int num,freq,tx_freq,tone;
char mode,tx_mode,split,tones;
char mode,tx_mode,tones;
num=chan->channel_num;
freq=(int)chan->freq;
@ -519,11 +528,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
if(chan->split==RIG_SPLIT_ON) {
tx_freq=(int)chan->tx_freq;
tx_mode=mode_to_char(chan->tx_mode);
split='1';
} else {
tx_freq=0;
tx_mode='\0';
split='0';
}
for (tone = 1; rig->caps->ctcss_list[tone-1] != 0 && tone<39; tone++) {
@ -539,6 +546,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ",
num,freq,mode,tones,tone);
if (cmd_len < 0)
return -RIG_ETRUNC;
mem_len = 0;
retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
if (retval != RIG_OK)
@ -546,6 +556,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ",
num,tx_freq,tx_mode,tones,tone);
if (cmd_len < 0)
return -RIG_ETRUNC;
mem_len = 0;
retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
if (retval != RIG_OK)
@ -589,23 +602,36 @@ int ts570_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
if (rit == 0) {
kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
return RIG_OK;
} else
kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
retval = kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
else
return RIG_OK;
} else {
retval = kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
else
c = 'D';
len = sprintf(buf, "R%c", c);
if (len < 0)
return -RIG_ETRUNC;
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/10)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -620,23 +646,36 @@ int ts570_set_xit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
if (rit == 0) {
kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
return RIG_OK;
} else
kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
retval = kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
else
return RIG_OK;
} else {
retval = kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
else
c = 'D';
len = sprintf(buf, "R%c", c);
if (len < 0)
return -RIG_ETRUNC;
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/10)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;

40
kenwood/ts850.c
Wyświetl plik

@ -248,10 +248,15 @@ int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
size_t info_len;
info_len = 0;
if (rit == 0)
kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
else
kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (rit == 0) {
retval = kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
} else {
retval = kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
@ -261,10 +266,15 @@ int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/20)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -278,13 +288,21 @@ int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
size_t info_len;
info_len = 0;
if (xit == 0)
kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
else
kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (xit == 0) {
retval = kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
} else {
retval = kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
if (xit > 0)
c = 'U';
else
@ -295,6 +313,8 @@ int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -413,7 +433,7 @@ int ts850_set_channel (RIG * rig, const channel_t * chan)
int retval, cmd_len;
size_t mem_len;
int num,freq,tx_freq,tone;
char mode,tx_mode,split,tones;
char mode,tx_mode,tones;
num=chan->channel_num;
freq=(int)chan->freq;
@ -421,11 +441,9 @@ int ts850_set_channel (RIG * rig, const channel_t * chan)
if(chan->split==RIG_SPLIT_ON) {
tx_freq=(int)chan->tx_freq;
tx_mode=mode_to_char(chan->tx_mode);
split='1';
} else {
tx_freq=0;
tx_mode='\0';
split='0';
}
for (tone = 1; rig->caps->ctcss_list[tone-1] != 0 && tone<39; tone++) {

3
kit/fifisdr.c
Wyświetl plik

@ -355,15 +355,12 @@ const char * fifisdr_get_info (RIG *rig)
static char buf[64];
int ret;
uint32_t svn_version;
int version;
ret = fifisdr_usb_read(rig, REQUEST_FIFISDR_READ, 0, 0, (char *)&svn_version, sizeof(svn_version));
if (ret != RIG_OK) {
return NULL;
}
version = svn_version;
snprintf(buf, sizeof(buf), "Firmware version: %d", svn_version);
return buf;

6
m2/rc2800.c
Wyświetl plik

@ -86,16 +86,22 @@ static int rc2800_parse (char *s, char *device, float *value)
{
msgtype=1;
i = sscanf(s+6, "%d", &errcode);
if (i == EOF)
return -RIG_EINVAL;
}
else if (!strncmp(s+2, "P=", 2))
{
msgtype=2;
i = num_sscanf(s+5, "%f", value);
if (i == EOF)
return -RIG_EINVAL;
}
else if (s[1] == '=')
{
msgtype=2;
i = num_sscanf(s+2, "%f", value);
if (i == EOF)
return -RIG_EINVAL;
}
}
}

2
pcr/pcr.c
Wyświetl plik

@ -794,6 +794,8 @@ pcr_set_mode(RIG * rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
buf_len = sprintf((char *) buf, "K%c%010" PRIll "0%c0%c00",
is_sub_rcvr(rig, vfo) ? '1':'0',
(int64_t) rcvr->last_freq, pcrmode, pcrfilter);
if (buf_len < 0)
return -RIG_ETRUNC;
err = pcr_transaction(rig, (char *) buf);
if (err != RIG_OK)

2
prm80/prm80.c
Wyświetl plik

@ -140,6 +140,8 @@ int prm80_reset(RIG *rig, reset_t reset)
* master reset ?
*/
retval = prm80_transaction (rig, "0", 1, NULL, NULL);
if (retval != RIG_OK)
return retval;
return RIG_OK;
}

4
racal/ra37xx.c
Wyświetl plik

@ -281,6 +281,8 @@ int ra37xx_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int freq_len;
freq_len = sprintf(freqbuf, "F%ld", (unsigned long)freq);
if (freq_len < 0)
return -RIG_ETRUNC;
return ra37xx_transaction (rig, freqbuf, NULL, NULL);
}
@ -338,6 +340,8 @@ int ra37xx_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
sprintf(buf, "M%d", ra_mode);
#endif
rig_debug(RIG_DEBUG_TRACE, "%s: widthtype = %i, widthnum = %i\n", __func__, widthtype, widthnum);
return ra37xx_transaction (rig, buf, NULL, NULL);
}

2
racal/racal.c
Wyświetl plik

@ -217,6 +217,8 @@ int racal_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int freq_len;
freq_len = sprintf(freqbuf, "F%0g", (double)(freq/MHz(1)));
if (freq_len < 0)
return -RIG_ETRUNC;
return racal_transaction (rig, freqbuf, NULL, NULL);
}

4
rpcrig/rpcrig_backend.c
Wyświetl plik

@ -194,7 +194,7 @@ static int rpcrig_open(RIG *rig)
model_x *mdl_res;
rigstate_res *rs_res;
rig_model_t model;
const struct rig_caps *caps;
// const struct rig_caps *caps;
char *server, *s;
int i;
@ -235,7 +235,7 @@ static int rpcrig_open(RIG *rig)
*/
rig_check_backend(model);
caps = rig_get_caps(model);
// caps = rig_get_caps(model);
/*
* TODO: decide if it's the way to go.

2
rpcrig/rpcrig_proc.c
Wyświetl plik

@ -375,6 +375,8 @@ val_res *getfunc_1_svc(setting_arg *arg, struct svc_req *svc)
&res.val_res_u.val.i);
return &res;
/* quell stupid gcc "set but not used" warning */
rig_debug(RIG_DEBUG_TRACE, "val = %d\n", val);
}
int *scan_1_svc(scan_arg *arg, struct svc_req *svc)

4
rpcrot/rpcrot_backend.c
Wyświetl plik

@ -129,7 +129,7 @@ static int rpcrot_open(ROT *rot)
model_x *mdl_res;
rotstate_res *rs_res;
rot_model_t model;
const struct rot_caps *caps;
// const struct rot_caps *caps;
char *server, *s;
rs = &rot->state;
@ -168,7 +168,7 @@ static int rpcrot_open(ROT *rot)
* autoload if necessary
*/
rot_check_backend(model);
caps = rot_get_caps(model);
// caps = rot_get_caps(model);
/*
* Load state values from remote rotator.

2
skanti/skanti.c
Wyświetl plik

@ -126,6 +126,8 @@ int skanti_reset(RIG *rig, reset_t reset)
*/
retval = skanti_transaction (rig, "0" EOM, strlen("0" EOM), NULL, NULL);
if (retval != RIG_OK)
return retval;
return RIG_OK;
}

2
src/conf.c
Wyświetl plik

@ -342,11 +342,9 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
*/
static int frontend_get_conf(RIG *rig, token_t token, char *val)
{
const struct rig_caps *caps;
struct rig_state *rs;
const char *s;
caps = rig->caps;
rs = &rig->state;
switch(token) {

4
src/rot_conf.c
Wyświetl plik

@ -124,11 +124,9 @@ static const struct confparams rotfrontend_serial_cfg_params[] = {
*/
int frontrot_set_conf(ROT *rot, token_t token, const char *val)
{
const struct rot_caps *caps;
struct rot_state *rs;
int val_i;
caps = rot->caps;
rs = &rot->state;
switch(token) {
@ -234,11 +232,9 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
*/
int frontrot_get_conf(ROT *rot, token_t token, char *val)
{
const struct rot_caps *caps;
struct rot_state *rs;
const char *s;
caps = rot->caps;
rs = &rot->state;
switch(token) {

9
tentec/tt550.c
Wyświetl plik

@ -167,6 +167,8 @@ tt550_ldg_control (RIG * rig, char oper)
char cmdbuf[4], lvlbuf[32];
cmd_len = sprintf (cmdbuf, "$%c" EOM, oper);
if (cmd_len < 0)
return cmd_len;
lvl_len = 3;
retval = tt550_transaction (rig, cmdbuf, 3, lvlbuf, &lvl_len);
/*
@ -1293,14 +1295,13 @@ int
tt550_set_func (RIG * rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16];
int fct_len, ack_len;
int fct_len;
struct tt550_priv_data *priv = (struct tt550_priv_data *) rig->state.priv;
struct rig_state *rs = &rig->state;
/* Optimize:
* sort the switch cases with the most frequent first
*/
ack_len = 0;
switch (func)
{
case RIG_FUNC_VOX:
@ -1522,7 +1523,7 @@ tt550_decode_event (RIG * rig)
unsigned char buf[MAXFRAMELEN];
int data_len;
short movement = 0;
char key;
// char key;
rig_debug (RIG_DEBUG_VERBOSE, "tt550: tt550_decode_event called\n");
@ -1560,7 +1561,7 @@ tt550_decode_event (RIG * rig)
{
movement = buf[1] << 8;
movement = movement | buf[2];
key = buf[3];
// key = buf[3];
rig_debug (RIG_DEBUG_VERBOSE,
"tt550: Step Direction = %d\n", movement);
if (movement > 0)

3
tests/memcsv.c
Wyświetl plik

@ -147,6 +147,9 @@ int csv_parm_save (RIG *rig, const char *outfilename)
if (!ms || !ms[0])
continue;
ret = rig_get_parm(rig, parm, &val);
if (ret != RIG_OK)
return ret;
if (RIG_PARM_IS_FLOAT(parm))
fprintf(f, "%f%c", val.f, csv_sep);
else

13
tests/rigsmtr.c
Wyświetl plik

@ -90,7 +90,7 @@ int main (int argc, char *argv[])
char rig_conf_parms[MAXCONFLEN] = "";
char rot_conf_parms[MAXCONFLEN] = "";
int with_rot = 1;
/* int with_rot = 1; */
azimuth_t azimuth;
elevation_t elevation;
unsigned step = 1000000; /* 1e6 us */
@ -260,8 +260,8 @@ int main (int argc, char *argv[])
strncpy(rot->state.rotport.pathname, rot_file, FILPATHLEN);
/* FIXME: bound checking and port type == serial */
if (serial_rate != 0)
rot->state.rotport.parm.serial.rate = serial_rate;
if (rot_serial_rate != 0)
rot->state.rotport.parm.serial.rate = rot_serial_rate;
retcode = rot_open(rot);
if (retcode != RIG_OK && rot_model != ROT_MODEL_DUMMY) {
@ -269,8 +269,11 @@ int main (int argc, char *argv[])
exit(2);
}
if (rot_model == ROT_MODEL_DUMMY)
with_rot = 1;
/* Commenting out to quell "set but not used" warning.
* Enable when needed for further functionality. -N0NB
*/
/* if (rot_model == ROT_MODEL_DUMMY) */
/* with_rot = 1; */
if (verbose > 0)
printf("Opened rotator model %d, '%s'\n", rot->caps->rot_model,

5
yaesu/ft100.c
Wyświetl plik

@ -371,14 +371,12 @@ int ft100_close(RIG *rig) {
static int ft100_send_priv_cmd(RIG *rig, unsigned char cmd_index) {
struct rig_state *rig_s;
struct ft100_priv_data *priv;
unsigned char *cmd; /* points to sequence to send */
rig_debug(RIG_DEBUG_VERBOSE,"%s called (%d)\n", __func__, cmd_index);
if (!rig) return -RIG_EINVAL;
priv = (struct ft100_priv_data*)rig->state.priv;
rig_s = &rig->state;
cmd = (unsigned char *) &ncmd[cmd_index].nseq; /* get native sequence */
@ -436,14 +434,11 @@ static int ft100_read_flags(RIG *rig)
int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
struct rig_state *rig_s;
struct ft100_priv_data *priv;
unsigned char p_cmd[YAESU_CMD_LENGTH];
unsigned char cmd_index; /* index of sequence to send */
if (!rig) return -RIG_EINVAL;
priv = (struct ft100_priv_data*)rig->state.priv;
rig_s = &rig->state;
rig_debug(RIG_DEBUG_VERBOSE,"ft100: requested freq = %"PRIfreq" Hz \n", freq);

4
yaesu/ft1000mp.c
Wyświetl plik

@ -912,16 +912,12 @@ int ft1000mp_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
*/
int ft1000mp_set_vfo(RIG *rig, vfo_t vfo) {
struct rig_state *rig_s;
struct ft1000mp_priv_data *p;
unsigned char cmd_index = 0; /* index of sequence to send */
rig_debug(RIG_DEBUG_TRACE,"ft1000mp: ft1000mp_set_vfo called %s\n", rig_strvfo(vfo));
p = (struct ft1000mp_priv_data*)rig->state.priv;
rig_s = &rig->state;
/*
* RIG_VFO_VFO/RIG_VFO_MEM are not available

6
yaesu/ft747.c
Wyświetl plik

@ -577,13 +577,10 @@ int ft747_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
*
*/
int ft747_set_vfo(RIG *rig, vfo_t vfo) {
struct rig_state *rig_s;
struct ft747_priv_data *p;
unsigned char cmd_index; /* index of sequence to send */
p = (struct ft747_priv_data*)rig->state.priv;
rig_s = &rig->state;
switch(vfo) {
@ -824,12 +821,9 @@ static int ft747_get_update_data(RIG *rig) {
static int ft747_send_priv_cmd(RIG *rig, unsigned char ci) {
struct rig_state *rig_s;
struct ft747_priv_data *p;
unsigned char *cmd; /* points to sequence to send */
unsigned char cmd_index; /* index of sequence to send */
p = (struct ft747_priv_data*)rig->state.priv;
rig_s = &rig->state;
cmd_index = ci; /* get command */

4
yaesu/ft990.c
Wyświetl plik

@ -2222,15 +2222,11 @@ int ft990_get_mem(RIG *rig, vfo_t vfo, int *ch)
*/
int ft990_set_channel (RIG *rig, const channel_t *chan)
{
struct ft990_priv_data *priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!rig)
return -RIG_EINVAL;
priv = (struct ft990_priv_data *) rig->state.priv;
return -RIG_ENIMPL;
}