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

Change rig_get_conf to rig_get_conf2 in Yaesu rigs

pull/928/head
Mike Black W9MDB 2022-01-10 17:22:33 -06:00
rodzic dfc3725de3
commit b0ae08f7b7
14 zmienionych plików z 16 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/yaesu/ft100.c
Wyświetl plik

@ -636,7 +636,7 @@ int ft100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
/* now convert it .... */
sprintf(freq_str, "%02X%02X%02X%02X",
SNPRINTF(freq_str, sizeof(freq_str), "%02X%02X%02X%02X",
priv->status.freq[0],
priv->status.freq[1],
priv->status.freq[2],

2
rigs/yaesu/ft1200.c
Wyświetl plik

@ -274,7 +274,7 @@ const struct rig_caps ftdx1200_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft2000.c
Wyświetl plik

@ -263,7 +263,7 @@ const struct rig_caps ft2000_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft3000.c
Wyświetl plik

@ -367,7 +367,7 @@ const struct rig_caps ftdx3000_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft450.c
Wyświetl plik

@ -162,7 +162,7 @@ const struct rig_caps ft450_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft5000.c
Wyświetl plik

@ -263,7 +263,7 @@ const struct rig_caps ftdx5000_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft757gx.c
Wyświetl plik

@ -888,7 +888,7 @@ static int ft757gx_get_conf(RIG *rig, token_t token, char *val)
switch (token)
{
case TOK_FAKEFREQ:
sprintf(val, "%d", priv->fakefreq);
SNPRINTF(val, sizeof(val), "%d", priv->fakefreq);
break;
default:

2
rigs/yaesu/ft9000.c
Wyświetl plik

@ -170,7 +170,7 @@ const struct rig_caps ft9000_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ft950.c
Wyświetl plik

@ -238,7 +238,7 @@ const struct rig_caps ft950_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ftdx10.c
Wyświetl plik

@ -262,7 +262,7 @@ const struct rig_caps ftdx10_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -263,7 +263,7 @@ const struct rig_caps ftdx101d_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

2
rigs/yaesu/ftdx101mp.c
Wyświetl plik

@ -201,7 +201,7 @@ const struct rig_caps ftdx101mp_caps =
.cfgparams = newcat_cfg_params,
.set_conf = newcat_set_conf,
.get_conf = newcat_get_conf,
.get_conf2 = newcat_get_conf2,
.set_freq = newcat_set_freq,
.get_freq = newcat_get_freq,
.set_mode = newcat_set_mode,

4
rigs/yaesu/newcat.c
Wyświetl plik

@ -679,7 +679,7 @@ int newcat_set_conf(RIG *rig, token_t token, const char *val)
* Get Configuration Token for Yaesu Radios
*/
int newcat_get_conf(RIG *rig, token_t token, char *val)
int newcat_get_conf2(RIG *rig, token_t token, char *val, int val_len)
{
int ret = RIG_OK;
struct newcat_priv_data *priv;
@ -701,7 +701,7 @@ int newcat_get_conf(RIG *rig, token_t token, char *val)
RETURNFUNC(-RIG_ENOMEM);
}
sprintf(val, "%d", priv->fast_set_commands);
SNPRINTF(val, val_len, "%d", priv->fast_set_commands);
break;
default:

3
rigs/yaesu/newcat.h
Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean;
/* shared function version */
#define NEWCAT_VER "20211227"
#define NEWCAT_VER "20220110"
/* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129
@ -160,6 +160,7 @@ int newcat_close(RIG *rig);
int newcat_set_conf(RIG *rig, token_t token, const char *val);
int newcat_get_conf(RIG *rig, token_t token, char *val);
int newcat_get_conf2(RIG *rig, token_t token, char *val, int val_len);
int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);