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

Change sprintf to snprint in tentec 

https://github.com/Hamlib/Hamlib/issues/857
pull/928/head
Mike Black W9MDB 2022-01-11 17:46:42 -06:00
rodzic b53bc014e3
commit 8c3a5e8d3c
8 zmienionych plików z 312 dodań i 323 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

79
rigs/tentec/jupiter.c
Wyświetl plik

@ -399,12 +399,12 @@ int tt538_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
char curVfo;
int cmd_len, resp_len, retval;
int resp_len, retval;
unsigned char cmdbuf[16], respbuf[32];
cmd_len = sprintf((char *) cmdbuf, "?%c" EOM, which_vfo(rig, vfo));
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?%c" EOM, which_vfo(rig, vfo));
resp_len = 7;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -445,7 +445,6 @@ int tt538_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int tt538_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
char bytes[4];
int cmd_len;
unsigned char cmdbuf[16];
/* Freq is 4 bytes long, MSB sent first. */
@ -454,11 +453,11 @@ int tt538_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
bytes[1] = ((int) freq >> 8) & 0xff;
bytes[0] = (int) freq & 0xff;
cmd_len = sprintf((char *) cmdbuf, "*%c%c%c%c%c" EOM,
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*%c%c%c%c%c" EOM,
which_vfo(rig, vfo),
bytes[3], bytes[2], bytes[1], bytes[0]);
return tt538_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
return tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
}
/*
@ -507,7 +506,7 @@ int tt538_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
*/
int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
int rpb;
unsigned char cmdbuf[16], respbuf[32];
char ttmode;
@ -522,9 +521,9 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
};
/* Query mode */
cmd_len = sprintf((char *) cmdbuf, "?M" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?M" EOM);
resp_len = 5;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -575,9 +574,9 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
}
/* Query passband width (filter) */
cmd_len = sprintf((char *) cmdbuf, "?W" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?W" EOM);
resp_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -632,14 +631,14 @@ static int tt538_filter_number(int width)
int tt538_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
unsigned char cmdbuf[32], respbuf[32], ttmode;
int cmd_len, resp_len, retval;
int resp_len, retval;
struct tt538_priv_data *priv = (struct tt538_priv_data *) rig->state.priv;
/* Query mode for both VFOs. */
cmd_len = sprintf((char *) cmdbuf, "?M" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?M" EOM);
resp_len = 5;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -681,11 +680,11 @@ int tt538_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
switch (vfo)
{
case RIG_VFO_A:
cmd_len = sprintf((char *) cmdbuf, "*M%c%c" EOM, ttmode, respbuf[2]);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*M%c%c" EOM, ttmode, respbuf[2]);
break;
case RIG_VFO_B:
cmd_len = sprintf((char *) cmdbuf, "*M%c%c" EOM, respbuf[1], ttmode);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*M%c%c" EOM, respbuf[1], ttmode);
break;
default:
@ -694,7 +693,7 @@ int tt538_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
return -RIG_EINVAL;
}
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -711,8 +710,8 @@ int tt538_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/* Set rx filter bandwidth. */
width = tt538_filter_number((int) width);
cmd_len = sprintf((char *) cmdbuf, "*W%c" EOM, (unsigned char) width);
return tt538_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*W%c" EOM, (unsigned char) width);
return tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
return RIG_OK;
}
@ -738,7 +737,7 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
float fwd, refl;
float ratio, swr;
int retval, cmd_len, lvl_len;
int retval, lvl_len;
unsigned char cmdbuf[16], lvlbuf[32];
@ -832,9 +831,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AGC:
/* Read rig's AGC level setting. */
cmd_len = sprintf((char *) cmdbuf, "?G" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?G" EOM);
lvl_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -867,9 +866,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AF:
/* Volume returned as single byte. */
cmd_len = sprintf((char *) cmdbuf, "?U" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?U" EOM);
lvl_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -889,9 +888,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RF:
cmd_len = sprintf((char *) cmdbuf, "?I" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?I" EOM);
lvl_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -914,9 +913,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_IF: /* IF passband tuning, Hz */
cmd_len = sprintf((char *) cmdbuf, "?P" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?P" EOM);
lvl_len = 5;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
& lvl_len);
if (retval != RIG_OK)
@ -936,9 +935,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_ATT:
cmd_len = sprintf((char *) cmdbuf, "?J" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?J" EOM);
lvl_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -958,9 +957,9 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_SQL:
cmd_len = sprintf((char *) cmdbuf, "?H" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?H" EOM);
lvl_len = 4;
retval = tt538_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt538_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -994,7 +993,7 @@ int tt538_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int tt538_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char cc, cmdbuf[32], c1, c2;
int cmd_len, retval;
int retval;
switch (level)
{
@ -1011,21 +1010,21 @@ int tt538_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default: cc = '2';
}
cmd_len = sprintf(cmdbuf, "*G%c" EOM, cc);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*G%c" EOM, cc);
break;
case RIG_LEVEL_AF:
cmd_len = sprintf(cmdbuf, "*U%c" EOM, (int)(127 * val.f));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*U%c" EOM, (int)(127 * val.f));
break;
case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "*I%c" EOM, (int)(127 * val.f));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*I%c" EOM, (int)(127 * val.f));
break;
case RIG_LEVEL_IF:
c1 = val.i >> 8;
c2 = val.i & 0xff;
cmd_len = sprintf(cmdbuf, "*P%c%c" EOM, c1, c2);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*P%c%c" EOM, c1, c2);
break;
case RIG_LEVEL_ATT:
@ -1038,11 +1037,11 @@ int tt538_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
cc = '0';
}
cmd_len = sprintf(cmdbuf, "*J%c" EOM, cc);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*J%c" EOM, cc);
break;
case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "*H%c" EOM, (int)(127 * val.f));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*H%c" EOM, (int)(127 * val.f));
break;
default:
@ -1051,7 +1050,7 @@ int tt538_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
retval = tt538_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt538_transaction(rig, cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{

127
rigs/tentec/omnivii.c
Wyświetl plik

@ -460,7 +460,7 @@ int tt588_reset(RIG *rig, reset_t reset)
int tt588_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
unsigned char cmdbuf[16], respbuf[32];
struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
@ -475,9 +475,9 @@ int tt588_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
return -RIG_EINVAL;
}
cmd_len = sprintf((char *) cmdbuf, "?%c" EOM, which_vfo(rig, vfo));
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?%c" EOM, which_vfo(rig, vfo));
resp_len = 6;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -515,7 +515,6 @@ int tt588_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int tt588_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
char bytes[4];
int cmd_len;
unsigned char cmdbuf[16];
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s freq=%g\n", __func__, rig_strvfo(vfo),
@ -546,11 +545,11 @@ int tt588_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
bytes[1] = ((int) freq >> 8) & 0xff;
bytes[0] = (int) freq & 0xff;
cmd_len = sprintf((char *) cmdbuf, "*%c%c%c%c%c" EOM,
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*%c%c%c%c%c" EOM,
which_vfo(rig, vfo),
bytes[3], bytes[2], bytes[1], bytes[0]);
return tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
return tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
}
/*
@ -600,7 +599,7 @@ int tt588_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
*/
int tt588_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
unsigned char cmdbuf[16], respbuf[32];
char ttmode;
struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
@ -620,9 +619,9 @@ int tt588_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
}
// Query mode
cmd_len = sprintf((char *) cmdbuf, "?M" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?M" EOM);
resp_len = 4;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (resp_len > 4)
@ -678,9 +677,9 @@ int tt588_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
}
/* Query passband width (filter) */
cmd_len = sprintf((char *) cmdbuf, "?W" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?W" EOM);
resp_len = 3;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -806,7 +805,7 @@ static int tt588_filter_number(int width)
int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
unsigned char cmdbuf[32], respbuf[32], ttmode;
int cmd_len, resp_len, retval;
int resp_len, retval;
struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
@ -820,9 +819,9 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
/* Query mode for both VFOs. */
cmd_len = sprintf((char *) cmdbuf, "?M" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?M" EOM);
resp_len = 4;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) respbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) respbuf,
&resp_len);
if (retval != RIG_OK)
@ -865,11 +864,11 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
switch (vfo)
{
case RIG_VFO_A:
cmd_len = sprintf((char *) cmdbuf, "*M%c%c" EOM, ttmode, respbuf[2]);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*M%c%c" EOM, ttmode, respbuf[2]);
break;
case RIG_VFO_B:
cmd_len = sprintf((char *) cmdbuf, "*M%c%c" EOM, respbuf[1], ttmode);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*M%c%c" EOM, respbuf[1], ttmode);
break;
default:
@ -877,7 +876,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
return -RIG_EINVAL;
}
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -893,8 +892,8 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
width = tt588_filter_number((int) width);
cmd_len = sprintf((char *) cmdbuf, "*W%c" EOM, (unsigned char) width);
return tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*W%c" EOM, (unsigned char) width);
return tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
}
/*
@ -904,7 +903,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
float fwd, refl;
int retval, cmd_len, lvl_len;
int retval, lvl_len;
unsigned char cmdbuf[16], lvlbuf[32];
if (check_vfo(vfo) == FALSE)
@ -1010,9 +1009,9 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AGC:
/* Read rig's AGC level setting. */
cmd_len = sprintf((char *) cmdbuf, "?G" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?G" EOM);
lvl_len = 3;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -1044,9 +1043,9 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AF:
/* Volume returned as single byte. */
cmd_len = sprintf((char *) cmdbuf, "?U" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?U" EOM);
lvl_len = 3;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -1070,9 +1069,9 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_RF:
cmd_len = sprintf((char *) cmdbuf, "?I" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?I" EOM);
lvl_len = 3;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -1091,9 +1090,9 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_ATT:
cmd_len = sprintf((char *) cmdbuf, "?J" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?J" EOM);
lvl_len = 33;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -1120,9 +1119,9 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_SQL:
cmd_len = sprintf((char *) cmdbuf, "?H" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "?H" EOM);
lvl_len = 3;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, (char *) lvlbuf,
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), (char *) lvlbuf,
&lvl_len);
if (retval != RIG_OK)
@ -1173,7 +1172,7 @@ int tt588_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
*/
int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
int retval, cmd_len, ii;
int retval, ii;
unsigned char cmdbuf[16], agcmode;
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s level=%s\n", __func__, rig_strvfo(vfo),
@ -1190,8 +1189,8 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_AF:
/* Volume */
cmd_len = sprintf((char *) cmdbuf, "*U%c" EOM, (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*U%c" EOM, (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1203,8 +1202,8 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_RF:
/* RF gain. Omni-VII expects value 0 for full gain, and 127 for lowest gain */
cmd_len = sprintf((char *) cmdbuf, "*I%c" EOM, 127 - (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*I%c" EOM, 127 - (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1228,9 +1227,9 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default: return -RIG_EINVAL;
}
cmd_len = sprintf((char *) cmdbuf, "*Gx" EOM);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*Gx" EOM);
cmdbuf[2] = agcmode;
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1248,8 +1247,8 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (rig->caps->attenuator[ii] > val.i) { break; }
}
cmd_len = sprintf((char *) cmdbuf, "*J%c" EOM, ii + '0');
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*J%c" EOM, ii + '0');
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1260,8 +1259,8 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_SQL:
/* Squelch level, float 0.0 - 1.0 */
cmd_len = sprintf((char *) cmdbuf, "*H%c" EOM, (int)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, cmd_len, NULL, NULL);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*H%c" EOM, (int)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char*)cmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1285,7 +1284,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
*/
int tt588_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
{
int retval, cmd_len, resp_len;
int retval, resp_len;
char cmdbuf[16], respbuf[16];
if (tx_vfo == RIG_VFO_SUB)
@ -1302,7 +1301,7 @@ int tt588_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
return -RIG_EINVAL;
}
cmd_len = sprintf(cmdbuf, "*Nx" EOM "?N" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*Nx" EOM "?N" EOM);
//if (split == RIG_SPLIT_ON || tx_vfo==RIG_VFO_B)
if (split == RIG_SPLIT_ON)
@ -1315,7 +1314,7 @@ int tt588_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
}
resp_len = 3;
retval = tt588_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -1338,7 +1337,7 @@ int tt588_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
*/
int tt588_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[16], respbuf[16];
if (check_vfo(vfo) == FALSE)
@ -1348,9 +1347,9 @@ int tt588_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
}
// get split on/off
cmd_len = sprintf(cmdbuf, "?N" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?N" EOM);
resp_len = 3;
retval = tt588_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (resp_len != 3)
{
@ -1393,7 +1392,7 @@ int tt588_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
*/
int tt588_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
int retval, cmd_len;
int retval;
char cmdbuf[32];
rig_debug(RIG_DEBUG_VERBOSE, "%s: ptt=%d\n", __func__, ptt);
@ -1404,7 +1403,7 @@ int tt588_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
return -RIG_EINVAL;
}
cmd_len = sprintf(cmdbuf, "*Txx" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*Txx" EOM);
cmdbuf[3] = 0;
if (ptt)
@ -1416,7 +1415,7 @@ int tt588_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
cmdbuf[2] = 0;
}
retval = tt588_transaction(rig, cmdbuf, cmd_len, NULL, 0); // no response
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, 0); // no response
if (retval != RIG_OK)
{
@ -1434,12 +1433,12 @@ int tt588_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
const char *tt588_get_info(RIG *rig)
{
static char cmdbuf[16], firmware[64];
int cmd_len, firmware_len = sizeof(firmware), retval;
int firmware_len = sizeof(firmware), retval;
cmd_len = sprintf(cmdbuf, "?V" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?V" EOM);
memset(firmware, 0, sizeof(firmware));
rig_debug(RIG_DEBUG_VERBOSE, "%s: firmware_len=%d\n", __func__, firmware_len);
retval = tt588_transaction(rig, cmdbuf, cmd_len, firmware, &firmware_len);
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), firmware, &firmware_len);
// Response should be "VER 1010-588 " plus "RADIO x\r" or "REMOTEx\r"
// if x=blank ham band transmit only
@ -1462,7 +1461,7 @@ const char *tt588_get_info(RIG *rig)
*/
int tt588_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[16], respbuf[16];
if (check_vfo(vfo) == FALSE)
@ -1472,9 +1471,9 @@ int tt588_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
}
// get xit
cmd_len = sprintf(cmdbuf, "?L" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?L" EOM);
resp_len = 5;
retval = tt588_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (resp_len != 5)
{
@ -1505,7 +1504,7 @@ int tt588_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
//
static int set_rit_xit(RIG *rig, vfo_t vfo, shortfreq_t rit, int which)
{
int retval, cmd_len;
int retval;
char cmdbuf[16];
rig_debug(RIG_DEBUG_VERBOSE, "%s: rit=%d\n", __func__, (int)rit);
@ -1518,11 +1517,11 @@ static int set_rit_xit(RIG *rig, vfo_t vfo, shortfreq_t rit, int which)
// For some reason need an extra \r on here
// This is with version 1.036 -- it appears to want 7 chars instead of 6
cmd_len = sprintf(cmdbuf, "*Lxxx" EOM EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*Lxxx" EOM EOM);
cmdbuf[2] = which; // set xit bit. 0=off,1=rit, 2=xit, 3=both
cmdbuf[3] = rit >> 8;
cmdbuf[4] = rit & 0xff;
retval = tt588_transaction(rig, cmdbuf, cmd_len, NULL, 0); // no response
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, 0); // no response
if (retval != RIG_OK)
{
@ -1558,7 +1557,7 @@ int tt588_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
*/
int tt588_get_ant(RIG *rig, vfo_t vfo, ant_t *ant)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[16], respbuf[16];
if (check_vfo(vfo) == FALSE)
@ -1568,10 +1567,10 @@ int tt588_get_ant(RIG *rig, vfo_t vfo, ant_t *ant)
}
// get xit
cmd_len = sprintf(cmdbuf, "*C1V" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*C1V" EOM);
resp_len = 5;
// this should be the only line needing change for remote operation
retval = tt588_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (resp_len != 5)
{
@ -1613,14 +1612,14 @@ int tt588_set_ant(RIG *rig, vfo_t vfo, ant_t ant)
rig_debug(RIG_DEBUG_VERBOSE, "%s: ant=%d\n", __func__, ant);
cmd_len = sprintf(cmdbuf, "*C1Vx" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*C1Vx" EOM);
// 0 = RX=TX=ANT1
// 1 = RX=TX=ANT2
// 2 = RX=RXAUX, TX=ANT1
// 3 = RX=RXAUC, TX=ANT2
cmdbuf[4] = ant;
// this should be the only line needing change for remote operation
retval = tt588_transaction(rig, cmdbuf, cmd_len, NULL, 0); // no response
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, 0); // no response
if (retval != RIG_OK)
{

190
rigs/tentec/orion.c
Wyświetl plik

@ -367,7 +367,7 @@ static char which_vfo(const RIG *rig, vfo_t vfo)
int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
int cmd_len, retval, i, in_range;
int retval, i, in_range;
freq_range_t this_range;
char cmdbuf[TT565_BUFSIZE];
/* Check for valid frequency request.
@ -402,7 +402,7 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
#ifdef TT565_ASCII_FREQ
/* Use ASCII mode to set frequencies */
// cppcheck-suppress *
cmd_len = sprintf(cmdbuf, "*%cF%"PRIll EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*%cF%"PRIll EOM,
which_vfo(rig, vfo),
(int64_t)freq);
#else
@ -414,7 +414,6 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* Construct command packet by brute force. */
unsigned int myfreq;
myfreq = freq;
cmd_len = 7;
cmdbuf[0] = '*';
cmdbuf[1] = which_vfo(rig, vfo);
cmdbuf[2] = (myfreq & 0xff000000) >> 24;
@ -422,8 +421,9 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
cmdbuf[4] = (myfreq & 0x0000ff00) >> 8;
cmdbuf[5] = myfreq & 0x000000ff;
cmdbuf[6] = '\r'; /* i.e. EOM */
cmdbuf[7] = 0;
#endif
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -438,20 +438,20 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
*/
int tt565_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
unsigned int binf;
#ifdef TT565_ASCII_FREQ
/* use ASCII mode */
cmd_len = sprintf(cmdbuf, "?%cF" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?%cF" EOM,
which_vfo(rig, vfo));
#else
/* Get freq with Orion binary mode short sequence. */
cmd_len = sprintf(cmdbuf, "?%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?%c" EOM,
which_vfo(rig, vfo));
#endif
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -501,10 +501,10 @@ int tt565_set_vfo(RIG *rig, vfo_t vfo)
{
char vfobuf[TT565_BUFSIZE];
/* Select Sub or Main RX */
int vfo_len = sprintf(vfobuf, "*K%c" EOM,
SNPRINTF(vfobuf, sizeof(vfobuf), "*K%c" EOM,
vfo == RIG_VFO_SUB ? 'S' : 'M');
return tt565_transaction(rig, vfobuf, vfo_len, NULL, NULL);
return tt565_transaction(rig, vfobuf, strlen(vfobuf), NULL, NULL);
}
priv->vfo_curr = vfo;
@ -539,15 +539,15 @@ int tt565_get_vfo(RIG *rig, vfo_t *vfo)
*/
int tt565_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
{
int cmd_len, retval;
int retval;
char cmdbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "*KV%c%c%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*KV%c%c%c" EOM,
which_vfo(rig, vfo),
'N', /* FIXME */
which_vfo(rig, RIG_SPLIT_ON == split ? tx_vfo : vfo));
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -580,13 +580,13 @@ static vfo_t tt2vfo(char c)
*/
int tt565_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
char ttreceiver;
cmd_len = sprintf(cmdbuf, "?KV" EOM);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?KV" EOM);
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -628,7 +628,7 @@ int tt565_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
struct rig_state *rs = &rig->state;
char ttmode, ttreceiver;
int mdbuf_len, retval;
int retval;
char mdbuf[TT565_BUFSIZE];
switch (mode)
@ -660,14 +660,14 @@ int tt565_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
ttreceiver = which_receiver(rig, vfo);
mdbuf_len = sprintf(mdbuf, "*R%cM%c" EOM "*R%cF%d" EOM,
SNPRINTF(mdbuf, sizeof(mdbuf), "*R%cM%c" EOM "*R%cF%d" EOM,
ttreceiver,
ttmode,
ttreceiver,
(int)width
);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
return retval;
}
@ -684,16 +684,16 @@ int tt565_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/
int tt565_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
char ttmode, ttreceiver;
ttreceiver = which_receiver(rig, vfo);
/* Query mode */
cmd_len = sprintf(cmdbuf, "?R%cM" EOM, ttreceiver);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cM" EOM, ttreceiver);
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -734,9 +734,9 @@ int tt565_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* Orion may need some time to "recover" from ?RxM before ?RxF */
hl_usleep(80000); // try 80 ms
/* Query passband width (filter) */
cmd_len = sprintf(cmdbuf, "?R%cF" EOM, ttreceiver);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cF" EOM, ttreceiver);
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -764,14 +764,14 @@ int tt565_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*/
int tt565_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
{
int cmd_len, retval;
int retval;
char cmdbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "*R%cI%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cI%d" EOM,
which_receiver(rig, vfo),
(int)ts);
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -785,14 +785,14 @@ int tt565_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
*/
int tt565_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "?R%cI" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cI" EOM,
which_receiver(rig, vfo));
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -821,14 +821,14 @@ int tt565_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
*/
int tt565_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
{
int cmd_len, retval;
int retval;
char cmdbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "*R%cR%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cR%d" EOM,
which_receiver(rig, vfo),
(int)rit);
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -842,14 +842,14 @@ int tt565_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
*/
int tt565_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "?R%cR" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cR" EOM,
which_receiver(rig, vfo));
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -878,16 +878,16 @@ int tt565_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
*/
int tt565_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
{
int cmd_len, retval;
int retval;
char cmdbuf[TT565_BUFSIZE];
/* Sub receiver does not contain an XIT setting */
cmd_len = sprintf(cmdbuf, "*R%cX%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cX%d" EOM,
'M',
(int)xit);
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -901,14 +901,14 @@ int tt565_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
*/
int tt565_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
{
int cmd_len, resp_len, retval;
int resp_len, retval;
char cmdbuf[TT565_BUFSIZE], respbuf[TT565_BUFSIZE];
cmd_len = sprintf(cmdbuf, "?R%cX" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cX" EOM,
'M');
resp_len = sizeof(respbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, respbuf, &resp_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len);
if (retval != RIG_OK)
{
@ -1071,13 +1071,13 @@ const char *tt565_get_info(RIG *rig)
*/
int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
int retval, cmd_len = 0, ii;
int retval, ii;
char cmdbuf[TT565_BUFSIZE], cc;
switch (level)
{
case RIG_LEVEL_RFPOWER:
cmd_len = sprintf(cmdbuf, "*TP%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TP%d" EOM,
(int)(val.f * 100));
break;
@ -1097,28 +1097,28 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default: cc = 'M';
}
cmd_len = sprintf(cmdbuf, "*R%cA%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cA%c" EOM,
which_receiver(rig, vfo),
cc);
break;
case RIG_LEVEL_AF:
/* AF Gain, float 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*U%c%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*U%c%d" EOM,
which_receiver(rig, vfo),
(int)(val.f * 255));
break;
case RIG_LEVEL_IF:
/* This is passband tuning int Hz */
cmd_len = sprintf(cmdbuf, "*R%cP%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cP%d" EOM,
which_receiver(rig, vfo),
val.i);
break;
case RIG_LEVEL_RF:
/* This is IF Gain, float 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*R%cG%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cG%d" EOM,
which_receiver(rig, vfo),
(int)(val.f * 100));
break;
@ -1132,7 +1132,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (rig->caps->attenuator[ii] > val.i) { break; }
}
cmd_len = sprintf(cmdbuf, "*R%cT%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cT%d" EOM,
which_receiver(rig, vfo),
ii);
break;
@ -1146,26 +1146,26 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
/* RF Preamp (main Rx), int 0 or 1 */
cmd_len = sprintf(cmdbuf, "*RME%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*RME%d" EOM,
val.i == 0 ? 0 : 1);
break;
case RIG_LEVEL_SQL:
/* Squelch level, float 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*R%cS%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cS%d" EOM,
which_receiver(rig, vfo),
(int)((val.f * 127) - 127));
break;
case RIG_LEVEL_MICGAIN:
/* Mic gain, float 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*TM%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TM%d" EOM,
(int)(val.f * 100));
break;
case RIG_LEVEL_COMP:
/* Speech Processor, float 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*TS%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TS%d" EOM,
(int)(val.f * 9));
break;
@ -1178,7 +1178,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (val.i > TT565_TONE_MAX) { val.i = TT565_TONE_MAX; }
else if (val.i < TT565_TONE_MIN) { val.i = TT565_TONE_MIN; }
cmd_len = sprintf(cmdbuf, "*CT%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*CT%d" EOM,
val.i);
break;
@ -1191,7 +1191,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (val.i > TT565_CW_MAX) { val.i = TT565_CW_MAX; }
else if (val.i < TT565_CW_MIN) { val.i = TT565_CW_MIN; }
cmd_len = sprintf(cmdbuf, "*CS%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*CS%d" EOM,
val.i);
break;
@ -1201,24 +1201,24 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
NR, NOTCH, and AN are not.
FOR NOW -- RIG_LEVEL_NR controls the Orion NB setting
*/
cmd_len = sprintf(cmdbuf, "*R%cNB%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*R%cNB%d" EOM,
which_receiver(rig, vfo),
(int)(val.f * 9));
break;
case RIG_LEVEL_VOXDELAY:
/* VOX delay, float tenths of seconds */
cmd_len = sprintf(cmdbuf, "*TH%4.2f" EOM, 0.1 * val.f);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TH%4.2f" EOM, 0.1 * val.f);
break;
case RIG_LEVEL_VOXGAIN:
/* Float, 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*TG%d" EOM, (int)(100.0 * val.f));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TG%d" EOM, (int)(100.0 * val.f));
break;
case RIG_LEVEL_ANTIVOX:
/* Float, 0.0 - 1.0 */
cmd_len = sprintf(cmdbuf, "*TA%d" EOM, (int)(100.0 * val.f));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*TA%d" EOM, (int)(100.0 * val.f));
break;
default:
@ -1227,7 +1227,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -1265,7 +1265,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
*/
int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
int retval, cmd_len, lvl_len;
int retval, lvl_len;
char cmdbuf[TT565_BUFSIZE], lvlbuf[TT565_BUFSIZE];
/* Optimize: sort the switch cases with the most frequent first */
@ -1368,11 +1368,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_AGC:
cmd_len = sprintf(cmdbuf, "?R%cA" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cA" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1405,11 +1405,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_AF:
cmd_len = sprintf(cmdbuf, "?U%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?U%c" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1427,11 +1427,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_IF:
cmd_len = sprintf(cmdbuf, "?R%cP" EOM, /* passband tuning */
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cP" EOM, /* passband tuning */
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1449,11 +1449,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "?R%cG" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cG" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1471,11 +1471,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_ATT:
cmd_len = sprintf(cmdbuf, "?R%cT" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cT" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1528,11 +1528,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "?R%cS" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cS" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1627,11 +1627,11 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_NR:
/* RIG_LEVEL_NR controls Orion NB setting - TEMP */
cmd_len = sprintf(cmdbuf, "?R%cNB" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "?R%cNB" EOM,
which_receiver(rig, vfo));
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, cmdbuf, cmd_len, lvlbuf, &lvl_len);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), lvlbuf, &lvl_len);
if (retval != RIG_OK)
{
@ -1766,13 +1766,12 @@ int tt565_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
struct tt565_priv_data *priv = (struct tt565_priv_data *)rig->state.priv;
char cmdbuf[TT565_BUFSIZE];
int retval;
int cmd_len;
switch (op)
{
case RIG_OP_TO_VFO:
case RIG_OP_FROM_VFO:
cmd_len = sprintf(cmdbuf, "*K%c%c%d" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*K%c%c%d" EOM,
op == RIG_OP_TO_VFO ? 'R' : 'W',
which_vfo(rig, vfo),
priv->ch);
@ -1780,12 +1779,11 @@ int tt565_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
case RIG_OP_TUNE:
strcpy(cmdbuf, "*TTT" EOM);
cmd_len = 5;
break;
case RIG_OP_UP:
case RIG_OP_DOWN:
cmd_len = sprintf(cmdbuf, "*%cS%c1" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "*%cS%c1" EOM,
which_vfo(rig, vfo),
op == RIG_OP_UP ? '+' : '-');
break;
@ -1796,7 +1794,7 @@ int tt565_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
return -RIG_EINVAL;
}
retval = tt565_transaction(rig, cmdbuf, cmd_len, NULL, NULL);
retval = tt565_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, NULL);
return retval;
}
@ -1845,8 +1843,8 @@ int tt565_send_morse(RIG *rig, vfo_t vfo, const char *msg)
for (ic = 0; ic < msg_len; ic++)
{
int cmdl = sprintf(morsecmd, "/%c" EOM, msg[ic]);
retval = tt565_transaction(rig, morsecmd, cmdl, NULL, NULL);
SNPRINTF(morsecmd, sizeof(morsecmd), "/%c" EOM, msg[ic]);
retval = tt565_transaction(rig, morsecmd, strlen(morsecmd), NULL, NULL);
if (retval != RIG_OK)
{
@ -1876,7 +1874,7 @@ int tt565_send_morse(RIG *rig, vfo_t vfo, const char *msg)
int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
char fcmdbuf[TT565_BUFSIZE];
int retval, fcmdlen;
int retval;
if (vfo != RIG_VFO_CURR)
{
@ -1886,15 +1884,15 @@ int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
switch (func)
{
case RIG_FUNC_TUNER:
fcmdlen = sprintf(fcmdbuf, "*TT%c" EOM, !status ? 0 : 1);
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "*TT%c" EOM, !status ? 0 : 1);
break;
case RIG_FUNC_VOX:
fcmdlen = sprintf(fcmdbuf, "*TV%c" EOM, !status ? 0 : 1);
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "*TV%c" EOM, !status ? 0 : 1);
break;
case RIG_FUNC_LOCK:
fcmdlen = sprintf(fcmdbuf, "*%c%c" EOM,
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "*%c%c" EOM,
which_vfo(rig, vfo),
!status ? 'U' : 'L');
break;
@ -1904,7 +1902,7 @@ int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
RIG_LEVEL_NR which maps to NB setting due to firmware
limitation.
*/
fcmdlen = sprintf(fcmdbuf, "*R%cNB%c" EOM,
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "*R%cNB%c" EOM,
which_receiver(rig, vfo),
!status ? '0' : '4');
break;
@ -1915,7 +1913,7 @@ int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return -RIG_EINVAL;
}
retval = tt565_transaction(rig, fcmdbuf, fcmdlen, NULL, NULL);
retval = tt565_transaction(rig, fcmdbuf, strlen(fcmdbuf), NULL, NULL);
if (retval != RIG_OK)
{
@ -1937,7 +1935,7 @@ int tt565_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
int tt565_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
char fcmdbuf[TT565_BUFSIZE], frespbuf[TT565_BUFSIZE];
int retval, fcmdlen, fresplen;
int retval, fresplen;
if (vfo != RIG_VFO_CURR)
{
@ -1947,19 +1945,19 @@ int tt565_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func)
{
case RIG_FUNC_TUNER:
fcmdlen = sprintf(fcmdbuf, "?TT" EOM);
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "?TT" EOM);
break;
case RIG_FUNC_VOX:
fcmdlen = sprintf(fcmdbuf, "?TV" EOM);
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "?TV" EOM);
break;
case RIG_FUNC_LOCK:
fcmdlen = sprintf(fcmdbuf, "?%cU" EOM,
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "?%cU" EOM,
which_vfo(rig, vfo));
/* needs special treatment */
fresplen = sizeof(frespbuf);
retval = tt565_transaction(rig, fcmdbuf, fcmdlen,
retval = tt565_transaction(rig, fcmdbuf, strlen(fcmdbuf),
frespbuf, &fresplen);
if (retval != RIG_OK)
@ -1975,11 +1973,11 @@ int tt565_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
/* Note NB should be a LEVEL for Orion. It is also
available through LEVEL_NR
*/
fcmdlen = sprintf(fcmdbuf, "?R%cNB" EOM,
SNPRINTF(fcmdbuf, sizeof(fcmdbuf), "?R%cNB" EOM,
which_receiver(rig, vfo));
/* needs special treatment */
fresplen = sizeof(frespbuf);
retval = tt565_transaction(rig, fcmdbuf, fcmdlen,
retval = tt565_transaction(rig, fcmdbuf, strlen(fcmdbuf),
frespbuf, &fresplen);
if (retval != RIG_OK)
@ -1998,7 +1996,7 @@ int tt565_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
}
fresplen = sizeof(frespbuf);
retval = tt565_transaction(rig, fcmdbuf, fcmdlen, frespbuf, &fresplen);
retval = tt565_transaction(rig, fcmdbuf, strlen(fcmdbuf), frespbuf, &fresplen);
if (retval != RIG_OK)
{

11
rigs/tentec/paragon.c
Wyświetl plik

@ -524,7 +524,6 @@ int tt585_set_mem(RIG *rig, vfo_t vfo, int ch)
{
struct tt585_priv_data *priv = (struct tt585_priv_data *)rig->state.priv;
char buf[16];
int ret;
if (ch < 0 || ch > 61)
{
@ -534,9 +533,9 @@ int tt585_set_mem(RIG *rig, vfo_t vfo, int ch)
priv->channel_num = ch;
/* does it work without a command after the channel number? */
ret = sprintf(buf, ":%02d", ch);
SNPRINTF(buf, sizeof(buf), ":%02d", ch);
return write_block(&rig->state.rigport, (unsigned char *) buf, ret);
return write_block(&rig->state.rigport, (unsigned char *) buf, strlen(buf));
}
int tt585_get_mem(RIG *rig, vfo_t vfo, int *ch)
@ -652,17 +651,17 @@ int tt585_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
case RIG_OP_TUNE: cmd = "Q"; break;
case RIG_OP_MCL:
sprintf(buf, ":%02dXD", priv->channel_num);
SNPRINTF(buf, sizeof(buf), ":%02dXD", priv->channel_num);
cmd = buf;
break;
case RIG_OP_TO_VFO:
sprintf(buf, ":%02d", priv->channel_num);
SNPRINTF(buf, sizeof(buf), ":%02d", priv->channel_num);
cmd = buf;
break;
case RIG_OP_FROM_VFO:
sprintf(buf, "<%02d", priv->channel_num);
SNPRINTF(buf, sizeof(buf), "<%02d", priv->channel_num);
cmd = buf;
break;

35
rigs/tentec/rx331.c
Wyświetl plik

@ -346,14 +346,14 @@ int rx331_set_conf(RIG *rig, token_t token, const char *val)
return RIG_OK;
}
int rx331_get_conf(RIG *rig, token_t token, char *val)
int rx331_get_conf2(RIG *rig, token_t token, char *val, int val_len)
{
struct rx331_priv_data *priv = (struct rx331_priv_data *)rig->state.priv;
switch (token)
{
case TOK_RIGID:
sprintf(val, "%u", priv->receiver_id);
SNPRINTF(val, val_len, "%u", priv->receiver_id);
break;
default:
@ -363,6 +363,11 @@ int rx331_get_conf(RIG *rig, token_t token, char *val)
return RIG_OK;
}
int rx331_get_conf(RIG *rig, token_t token, char *val)
{
return rx331_get_conf2(rig, token, val, 128);
}
int rx331_open(RIG *rig)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -398,7 +403,7 @@ int rx331_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int freq_len, retval;
char freqbuf[16];
freq_len = num_sprintf(freqbuf, "$%uF%.6f" EOM,
freq_len = num_snprintf(freqbuf, sizeof(freqbuf), "$%uF%.6f" EOM,
priv->receiver_id, freq / 1e6);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, freq_len);
@ -480,7 +485,7 @@ int rx331_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/*
* Set DETECTION MODE and IF FILTER
*/
mdbuf_len = num_sprintf(mdbuf, "$%uD%cI%.02f" EOM, priv->receiver_id,
mdbuf_len = num_snprintf(mdbuf, sizeof(mdbuf), "$%uD%cI%.02f" EOM, priv->receiver_id,
dmode, (float)width / 1e3);
}
else
@ -488,7 +493,7 @@ int rx331_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/*
* Set DETECTION MODE
*/
mdbuf_len = num_sprintf(mdbuf, "$%uD%c" EOM, priv->receiver_id, dmode);
mdbuf_len = num_snprintf(mdbuf, sizeof(mdbuf), "$%uD%c" EOM, priv->receiver_id, dmode);
}
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
@ -563,19 +568,19 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct rx331_priv_data *priv = (struct rx331_priv_data *)rig->state.priv;
struct rig_state *rs = &rig->state;
int cmd_len, retval = RIG_OK;
int retval = RIG_OK;
char cmdbuf[32];
switch (level)
{
case RIG_LEVEL_ATT:
cmd_len = sprintf(cmdbuf, "$%uK%i" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%uK%i" EOM,
priv->receiver_id,
val.i ? RX331_ATT_ON : RX331_ATT_OFF);
break;
case RIG_LEVEL_PREAMP:
cmd_len = sprintf(cmdbuf, "$%uK%i" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%uK%i" EOM,
priv->receiver_id,
val.i ? RX331_PREAMP_ON : RX331_PREAMP_OFF);
break;
@ -598,33 +603,33 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
cmd_len = sprintf(cmdbuf, "$%uM%i" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%uM%i" EOM,
priv->receiver_id, val.i);
break;
case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "$%uA%d" EOM, priv->receiver_id,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%uA%d" EOM, priv->receiver_id,
120 - (int)(val.f * 120));
break;
case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "$%uQ%d" EOM, priv->receiver_id,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%uQ%d" EOM, priv->receiver_id,
120 - (int)(val.f * 120));
break;
case RIG_LEVEL_NOTCHF:
cmd_len = num_sprintf(cmdbuf, "$%uN%f" EOM, priv->receiver_id,
num_snprintf(cmdbuf, sizeof(cmdbuf), "$%uN%f" EOM, priv->receiver_id,
((float)val.i) / 1e3);
break;
case RIG_LEVEL_IF:
cmd_len = num_sprintf(cmdbuf, "$%uP%f" EOM, priv->receiver_id,
num_snprintf(cmdbuf, sizeof(cmdbuf), "$%uP%f" EOM, priv->receiver_id,
((float)val.i) / 1e3);
break;
case RIG_LEVEL_CWPITCH:
/* only in CW mode */
cmd_len = num_sprintf(cmdbuf, "$%uB%f" EOM, priv->receiver_id,
num_snprintf(cmdbuf, sizeof(cmdbuf), "$%uB%f" EOM, priv->receiver_id,
((float)val.i) / 1e3);
break;
@ -634,7 +639,7 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
return retval;
}

34
rigs/tentec/rx340.c
Wyświetl plik

@ -299,12 +299,12 @@ int rx340_close(RIG *rig)
int rx340_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
struct rig_state *rs = &rig->state;
int freq_len, retval;
int retval;
char freqbuf[16];
freq_len = num_sprintf(freqbuf, "F%.6f" EOM, freq / 1e6);
SNPRINTF(freqbuf, sizeof(freqbuf), "F%.6f" EOM, freq / 1e6);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, freq_len);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, strlen(freqbuf));
return retval;
}
@ -347,7 +347,7 @@ int rx340_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
struct rig_state *rs = &rig->state;
char dmode;
int mdbuf_len, retval;
int retval;
char mdbuf[32];
switch (mode)
@ -383,7 +383,7 @@ int rx340_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/*
* Set DETECTION MODE and IF FILTER
*/
mdbuf_len = num_sprintf(mdbuf, "D%cI%.02f" EOM,
SNPRINTF(mdbuf, sizeof(mdbuf), "D%cI%.02f" EOM,
dmode, (float)width / 1e3);
}
else
@ -391,10 +391,10 @@ int rx340_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/*
* Set DETECTION MODE
*/
mdbuf_len = num_sprintf(mdbuf, "D%c" EOM, dmode);
SNPRINTF(mdbuf, sizeof(mdbuf), "D%c" EOM, dmode);
}
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
return retval;
}
@ -467,45 +467,45 @@ int rx340_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
int rx340_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct rig_state *rs = &rig->state;
int cmd_len, retval = RIG_OK;
int retval = RIG_OK;
char cmdbuf[32];
switch (level)
{
case RIG_LEVEL_ATT:
cmd_len = sprintf(cmdbuf, "K%c" EOM, val.i ? '3' : '1');
SNPRINTF(cmdbuf, sizeof(cmdbuf), "K%c" EOM, val.i ? '3' : '1');
break;
case RIG_LEVEL_PREAMP:
cmd_len = sprintf(cmdbuf, "K%c" EOM, val.i ? '2' : '1');
SNPRINTF(cmdbuf, sizeof(cmdbuf), "K%c" EOM, val.i ? '2' : '1');
break;
case RIG_LEVEL_AGC:
/* default to MEDIUM */
cmd_len = sprintf(cmdbuf, "M%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "M%c" EOM,
val.i == RIG_AGC_SLOW ? '3' : (
val.i == RIG_AGC_FAST ? '1' : '2'));
break;
case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "A%d" EOM, 120 - (int)(val.f * 120));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "A%d" EOM, 120 - (int)(val.f * 120));
break;
case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "Q%d" EOM, 150 - (int)(val.f * 150));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "Q%d" EOM, 150 - (int)(val.f * 150));
break;
case RIG_LEVEL_NOTCHF:
cmd_len = num_sprintf(cmdbuf, "N%f" EOM, ((float)val.i) / 1e3);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "N%f" EOM, ((float)val.i) / 1e3);
break;
case RIG_LEVEL_IF:
cmd_len = num_sprintf(cmdbuf, "P%f" EOM, ((float)val.i) / 1e3);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "P%f" EOM, ((float)val.i) / 1e3);
break;
case RIG_LEVEL_CWPITCH:
/* only in CW mode */
cmd_len = num_sprintf(cmdbuf, "B%f" EOM, ((float)val.i) / 1e3);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "B%f" EOM, ((float)val.i) / 1e3);
break;
default:
@ -514,7 +514,7 @@ int rx340_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
return retval;
}

26
rigs/tentec/tentec.c
Wyświetl plik

@ -236,7 +236,7 @@ int tentec_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
struct tentec_priv_data *priv;
struct rig_state *rs = &rig->state;
int freq_len, retval;
int retval;
char freqbuf[16];
freq_t old_freq;
@ -246,12 +246,12 @@ int tentec_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
priv->freq = freq;
tentec_tuning_factor_calc(rig);
freq_len = sprintf(freqbuf, "N%c%c%c%c%c%c" EOM,
SNPRINTF(freqbuf, sizeof(freqbuf), "N%c%c%c%c%c%c" EOM,
priv->ctf >> 8, priv->ctf & 0xff,
priv->ftf >> 8, priv->ftf & 0xff,
priv->btf >> 8, priv->btf & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, freq_len);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, strlen(freqbuf));
if (retval != RIG_OK)
{
@ -286,7 +286,7 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
char ttmode;
rmode_t saved_mode;
pbwidth_t saved_width;
int mdbuf_len, ttfilter = -1, retval;
int ttfilter = -1, retval;
char mdbuf[32];
switch (mode)
@ -344,7 +344,7 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (width != RIG_PASSBAND_NOCHANGE)
{
mdbuf_len = sprintf(mdbuf, "W%c" EOM
SNPRINTF(mdbuf, sizeof(mdbuf), "W%c" EOM
"N%c%c%c%c%c%c" EOM
"M%c" EOM,
ttfilter,
@ -352,7 +352,7 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
priv->ftf >> 8, priv->ftf & 0xff,
priv->btf >> 8, priv->btf & 0xff,
ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -363,14 +363,14 @@ int tentec_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
else
{
mdbuf_len = sprintf(mdbuf,
SNPRINTF(mdbuf, sizeof(mdbuf),
"N%c%c%c%c%c%c" EOM
"M%c" EOM,
priv->ctf >> 8, priv->ctf & 0xff,
priv->ftf >> 8, priv->ftf & 0xff,
priv->btf >> 8, priv->btf & 0xff,
ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -406,7 +406,7 @@ int tentec_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct tentec_priv_data *priv = (struct tentec_priv_data *)rig->state.priv;
struct rig_state *rs = &rig->state;
int cmd_len, retval = RIG_OK;
int retval = RIG_OK;
char cmdbuf[32];
/* Optimize:
@ -416,10 +416,10 @@ int tentec_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
case RIG_LEVEL_AGC:
/* default to MEDIUM */
cmd_len = sprintf(cmdbuf, "G%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "G%c" EOM,
val.i == RIG_AGC_SLOW ? '1' : (
val.i == RIG_AGC_FAST ? '3' : '2'));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -432,8 +432,8 @@ int tentec_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* FIXME: support also separate Lineout setting
* -> need to create RIG_LEVEL_LINEOUT ?
*/
cmd_len = sprintf(cmdbuf, "C\x7f%c" EOM, (int)((1.0 - val.f) * 63.0));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "C\x7f%c" EOM, (int)((1.0 - val.f) * 63.0));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{

133
rigs/tentec/tt550.c
Wyświetl plik

@ -86,7 +86,7 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval != RIG_OK)
{
@ -134,11 +134,11 @@ int
tt550_tx_control(RIG *rig, char oper)
{
struct rig_state *rs = &rig->state;
int retval, cmd_len;
int retval;
char cmdbuf[4];
cmd_len = sprintf(cmdbuf, "#%c" EOM, oper);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "#%c" EOM, oper);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
/*
* if (retval == RIG_OK) not currently saving the state of these operations I'm
* not sure we need to, but if so, this is where it would go.
@ -173,15 +173,10 @@ tt550_tx_control(RIG *rig, char oper)
int
tt550_ldg_control(RIG *rig, char oper)
{
int retval, cmd_len, lvl_len;
int retval, lvl_len;
char cmdbuf[4], lvlbuf[32];
cmd_len = sprintf(cmdbuf, "$%c" EOM, oper);
if (cmd_len < 0)
{
return cmd_len;
}
SNPRINTF(cmdbuf, sizeof(cmdbuf), "$%c" EOM, oper);
lvl_len = 3;
retval = tt550_transaction(rig, cmdbuf, 3, lvlbuf, &lvl_len);
@ -611,7 +606,7 @@ tt550_set_rx_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
struct tt550_priv_data *priv;
struct rig_state *rs = &rig->state;
int freq_len, retval;
int retval;
char freqbuf[16];
priv = (struct tt550_priv_data *) rig->state.priv;
@ -620,11 +615,11 @@ tt550_set_rx_freq(RIG *rig, vfo_t vfo, freq_t freq)
tt550_tuning_factor_calc(rig, RECEIVE);
freq_len = sprintf(freqbuf, "N%c%c%c%c%c%c" EOM,
SNPRINTF(freqbuf, sizeof(freqbuf), "N%c%c%c%c%c%c" EOM,
priv->ctf >> 8, priv->ctf & 0xff, priv->ftf >> 8,
priv->ftf & 0xff, priv->btf >> 8, priv->btf & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, freq_len);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, strlen(freqbuf));
if (retval != RIG_OK)
{
@ -645,7 +640,7 @@ tt550_set_tx_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
struct tt550_priv_data *priv;
struct rig_state *rs = &rig->state;
int freq_len, retval;
int retval;
char freqbuf[16];
priv = (struct tt550_priv_data *) rig->state.priv;
@ -654,11 +649,11 @@ tt550_set_tx_freq(RIG *rig, vfo_t vfo, freq_t freq)
tt550_tuning_factor_calc(rig, TRANSMIT);
freq_len = sprintf(freqbuf, "T%c%c%c%c%c%c" EOM,
SNPRINTF(freqbuf, sizeof(freqbuf), "T%c%c%c%c%c%c" EOM,
priv->ctf >> 8, priv->ctf & 0xff, priv->ftf >> 8,
priv->ftf & 0xff, priv->btf >> 8, priv->btf & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, freq_len);
retval = write_block(&rs->rigport, (unsigned char *) freqbuf, strlen(freqbuf));
if (retval != RIG_OK)
{
@ -697,7 +692,7 @@ tt550_set_rx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
char ttmode;
rmode_t saved_mode;
pbwidth_t saved_width;
int mdbuf_len, ttfilter = -1, retval;
int ttfilter = -1, retval;
char mdbuf[48];
/*
@ -767,8 +762,8 @@ tt550_set_rx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
tt550_tuning_factor_calc(rig, RECEIVE);
mdbuf_len = sprintf(mdbuf, "M%c%c" EOM, ttmode, ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
SNPRINTF(mdbuf, sizeof(mdbuf), "M%c%c" EOM, ttmode, ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -779,12 +774,12 @@ tt550_set_rx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (width != RIG_PASSBAND_NOCHANGE)
{
mdbuf_len = sprintf(mdbuf, "W%c" EOM
SNPRINTF(mdbuf, sizeof(mdbuf), "W%c" EOM
"N%c%c%c%c%c%c" EOM,
ttfilter,
priv->ctf >> 8, priv->ctf & 0xff, priv->ftf >> 8,
priv->ftf & 0xff, priv->btf >> 8, priv->btf & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -812,7 +807,7 @@ tt550_set_tx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
char ttmode;
rmode_t saved_mode;
pbwidth_t saved_width;
int mdbuf_len, ttfilter = -1, retval;
int ttfilter = -1, retval;
char mdbuf[48];
switch (mode)
@ -900,8 +895,8 @@ tt550_set_tx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
tt550_tuning_factor_calc(rig, TRANSMIT);
mdbuf_len = sprintf(mdbuf, "M%c%c" EOM, ttmode, ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
SNPRINTF(mdbuf, sizeof(mdbuf), "M%c%c" EOM, ttmode, ttmode);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -912,12 +907,12 @@ tt550_set_tx_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (width != RIG_PASSBAND_NOCHANGE)
{
mdbuf_len = sprintf(mdbuf, "C%c" EOM
SNPRINTF(mdbuf, sizeof(mdbuf), "C%c" EOM
"T%c%c%c%c%c%c" EOM,
ttfilter,
priv->ctf >> 8, priv->ctf & 0xff, priv->ftf >> 8,
priv->ftf & 0xff, priv->btf >> 8, priv->btf & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, mdbuf_len);
retval = write_block(&rs->rigport, (unsigned char *) mdbuf, strlen(mdbuf));
if (retval != RIG_OK)
{
@ -1007,16 +1002,15 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
struct tt550_priv_data *priv = (struct tt550_priv_data *) rig->state.priv;
struct rig_state *rs = &rig->state;
int cmd_len, retval, ditfactor, dahfactor, spcfactor;
int retval, ditfactor, dahfactor, spcfactor;
char cmdbuf[32];
switch (level)
{
case RIG_LEVEL_AGC:
cmd_len =
sprintf(cmdbuf, "G%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "G%c" EOM,
val.i >= 3 ? '3' : (val.i < 2 ? '1' : '2'));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1026,8 +1020,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_AF:
cmd_len = sprintf(cmdbuf, "V%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "V%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1038,8 +1032,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
#ifdef RIG_LEVEL_LINEOUT
case RIG_LEVEL_LINEOUT:
cmd_len = sprintf(cmdbuf, "L%c" EOM, (int)(val.f * 63));
retval = write_block(&rs->rigport, cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "L%c" EOM, (int)(val.f * 63));
retval = write_block(&rs->rigport, cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1050,8 +1044,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
#endif
case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "A%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "A%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1061,8 +1055,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "S%c" EOM, (int)(val.f * 19));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "S%c" EOM, (int)(val.f * 19));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1072,8 +1066,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_NR:
cmd_len = sprintf(cmdbuf, "D%c" EOM, (int)(val.f * 7));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "D%c" EOM, (int)(val.f * 7));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1086,8 +1080,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/*
* attenuator is either on or off
*/
cmd_len = sprintf(cmdbuf, "B%c" EOM, val.i < 15 ? '0' : '1');
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "B%c" EOM, val.i < 15 ? '0' : '1');
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1102,11 +1096,11 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
(val.i * (double) 0.4166 * (double) 0.0001667)));
dahfactor = ditfactor * 3;
cmd_len = sprintf(cmdbuf, "E%c%c%c%c%c%c" EOM,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "E%c%c%c%c%c%c" EOM,
ditfactor >> 8, ditfactor & 0xff, dahfactor >> 8,
dahfactor & 0xff, spcfactor >> 8,
spcfactor & 0xff);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1116,8 +1110,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_RFPOWER:
cmd_len = sprintf(cmdbuf, "P%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "P%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1127,8 +1121,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_VOXGAIN:
cmd_len = sprintf(cmdbuf, "UG%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "UG%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1138,8 +1132,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_VOXDELAY:
cmd_len = sprintf(cmdbuf, "UH%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "UH%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1149,8 +1143,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_ANTIVOX:
cmd_len = sprintf(cmdbuf, "UA%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "UA%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1160,8 +1154,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_COMP:
cmd_len = sprintf(cmdbuf, "Y%c" EOM, (int)(val.f * 127));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "Y%c" EOM, (int)(val.f * 127));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1171,8 +1165,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_MICGAIN:
cmd_len = sprintf(cmdbuf, "O1%c%c" EOM, 0, (int)(val.f * 15));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "O1%c%c" EOM, 0, (int)(val.f * 15));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1182,8 +1176,8 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_BKINDL:
cmd_len = sprintf(cmdbuf, "UQ%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "UQ%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf));
if (retval == RIG_OK)
{
@ -1382,11 +1376,10 @@ int
tt550_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
struct rig_state *rs = &rig->state;
int cmd_len;
char cmdbuf[16];
cmd_len = sprintf(cmdbuf, "Q%c" EOM, ptt == 0 ? '0' : '1');
return (write_block(&rs->rigport, (unsigned char *) cmdbuf, cmd_len));
SNPRINTF(cmdbuf, sizeof(cmdbuf), "Q%c" EOM, ptt == 0 ? '0' : '1');
return (write_block(&rs->rigport, (unsigned char *) cmdbuf, strlen(cmdbuf)));
}
@ -1455,7 +1448,6 @@ int
tt550_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16];
int fct_len;
struct tt550_priv_data *priv = (struct tt550_priv_data *) rig->state.priv;
struct rig_state *rs = &rig->state;
@ -1465,24 +1457,21 @@ tt550_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
switch (func)
{
case RIG_FUNC_VOX:
fct_len =
sprintf((char *) fctbuf, "U%c" EOM, status == 0 ? '0' : '1');
SNPRINTF((char *) fctbuf, sizeof(fctbuf), "U%c" EOM, status == 0 ? '0' : '1');
priv->vox = status;
return write_block(&rs->rigport, fctbuf, fct_len);
return write_block(&rs->rigport, fctbuf, strlen((char*)fctbuf));
case RIG_FUNC_NR:
fct_len =
sprintf((char *) fctbuf, "K%c%c" EOM, status == 0 ? '0' : '1',
SNPRINTF((char *) fctbuf, sizeof(fctbuf), "K%c%c" EOM, status == 0 ? '0' : '1',
priv->anf == 0 ? '0' : '1');
priv->en_nr = status;
return write_block(&rs->rigport, fctbuf, fct_len);
return write_block(&rs->rigport, fctbuf, strlen((char*)fctbuf));
case RIG_FUNC_ANF:
fct_len =
sprintf((char *) fctbuf, "K%c%c" EOM, priv->en_nr == 0 ? '0' : '1',
SNPRINTF((char *) fctbuf, sizeof(fctbuf), "K%c%c" EOM, priv->en_nr == 0 ? '0' : '1',
status == 0 ? '0' : '1');
priv->anf = status;
return write_block(&rs->rigport, fctbuf, fct_len);
return write_block(&rs->rigport, fctbuf, strlen((char*)fctbuf));
case RIG_FUNC_TUNER: