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

Change to hamlib_token_t in swg files 

05033171c3 (commitcomment-137562136)
pull/1486/head
Mike Black W9MDB 2024-01-22 09:31:50 -06:00
rodzic 1bb469f90f
commit 75cf467c1d
3 zmienionych plików z 18 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
bindings/amplifier.swg
Wyświetl plik

@ -92,14 +92,14 @@ typedef struct Amp {
AMPMETHOD1(set_powerstat, powerstat_t) AMPMETHOD1(set_powerstat, powerstat_t)
void set_conf(const char *name, const char *val) { void set_conf(const char *name, const char *val) {
token_t tok = amp_token_lookup(self->amp, name); hamlib_token_t tok = amp_token_lookup(self->amp, name);
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;
else else
self->error_status = amp_set_conf(self->amp, tok, val); self->error_status = amp_set_conf(self->amp, tok, val);
} }
AMPMETHOD2(set_conf, token_t, const_char_string) AMPMETHOD2(set_conf, hamlib_token_t, const_char_string)
/* /*
* declare wrapper method with one output argument besides AMP* * declare wrapper method with one output argument besides AMP*
@ -110,14 +110,14 @@ typedef struct Amp {
/* get functions */ /* get functions */
const char *get_conf(token_t tok) { const char *get_conf(hamlib_token_t tok) {
static char s[128] = ""; static char s[128] = "";
self->error_status = amp_get_conf(self->amp, tok, s); self->error_status = amp_get_conf(self->amp, tok, s);
return s; return s;
} }
const char *get_conf(const char *name) { const char *get_conf(const char *name) {
token_t tok = amp_token_lookup(self->amp, name); hamlib_token_t tok = amp_token_lookup(self->amp, name);
static char s[128] = ""; static char s[128] = "";
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;

20
bindings/rig.swg
Wyświetl plik

@ -359,7 +359,7 @@ typedef channel_t * const_channel_t_p;
METHOD3(set_ts, shortfreq_t) METHOD3(set_ts, shortfreq_t)
METHOD2(set_ant, ant_t, value_t) METHOD2(set_ant, ant_t, value_t)
METHOD2(set_func, setting_t, int) METHOD2(set_func, setting_t, int)
METHOD2(set_ext_func, token_t, int) METHOD2(set_ext_func, hamlib_token_t, int)
METHOD3(set_bank, int) METHOD3(set_bank, int)
METHOD3(set_mem, int) METHOD3(set_mem, int)
METHOD3(send_dtmf, const_char_string) METHOD3(send_dtmf, const_char_string)
@ -371,7 +371,7 @@ typedef channel_t * const_channel_t_p;
METHODSUPERSET(level, int, i, RIG_LEVEL_IS_FLOAT(stg)) METHODSUPERSET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
METHODSUPERSET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg)) METHODSUPERSET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg))
METHODSTRSET(level) METHODSTRSET(level)
METHOD2(set_ext_level, token_t, value_t) METHOD2(set_ext_level, hamlib_token_t, value_t)
METHODSIMPLEGET(level, int, i, RIG_LEVEL_IS_FLOAT(stg)) METHODSIMPLEGET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
METHODSIMPLEGET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg)) METHODSIMPLEGET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg))
@ -403,8 +403,8 @@ typedef channel_t * const_channel_t_p;
METHOD1(ext_token_lookup, const_char_string) /* level & parm */ METHOD1(ext_token_lookup, const_char_string) /* level & parm */
METHOD1(token_lookup, const_char_string) /* conf */ METHOD1(token_lookup, const_char_string) /* conf */
METHOD2(set_conf, token_t, const_char_string) METHOD2(set_conf, hamlib_token_t, const_char_string)
METHOD2(set_ext_parm, token_t, value_t) METHOD2(set_ext_parm, hamlib_token_t, value_t)
METHODSIMPLESET(parm, int, i, RIG_PARM_IS_FLOAT(stg)) METHODSIMPLESET(parm, int, i, RIG_PARM_IS_FLOAT(stg))
METHODSIMPLESET(parm, float, f, !RIG_PARM_IS_FLOAT(stg)) METHODSIMPLESET(parm, float, f, !RIG_PARM_IS_FLOAT(stg))
@ -420,7 +420,7 @@ typedef channel_t * const_channel_t_p;
void set_conf(const char *name, const char *val) { void set_conf(const char *name, const char *val) {
token_t tok = rig_token_lookup(self->rig, name); hamlib_token_t tok = rig_token_lookup(self->rig, name);
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;
else else
@ -508,14 +508,14 @@ typedef channel_t * const_channel_t_p;
return chan; return chan;
} }
void get_conf(token_t tok, char *returnstr) { void get_conf(hamlib_token_t tok, char *returnstr) {
returnstr[0] = '\0'; returnstr[0] = '\0';
self->error_status = rig_get_conf(self->rig, tok, returnstr); self->error_status = rig_get_conf(self->rig, tok, returnstr);
} }
void get_conf(const char *name, char *returnstr) { void get_conf(const char *name, char *returnstr) {
returnstr[0] = '\0'; returnstr[0] = '\0';
token_t tok = rig_token_lookup(self->rig, name); hamlib_token_t tok = rig_token_lookup(self->rig, name);
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;
else else
@ -540,7 +540,7 @@ typedef channel_t * const_channel_t_p;
return status; return status;
} }
int get_ext_func(token_t func, vfo_t vfo = RIG_VFO_CURR) { int get_ext_func(hamlib_token_t func, vfo_t vfo = RIG_VFO_CURR) {
int status; int status;
self->error_status = rig_get_ext_func(self->rig, vfo, func, &status); self->error_status = rig_get_ext_func(self->rig, vfo, func, &status);
return status; return status;
@ -554,7 +554,7 @@ typedef channel_t * const_channel_t_p;
/* TODO: dynamic casting */ /* TODO: dynamic casting */
} }
void get_ext_level(token_t token, vfo_t vfo = RIG_VFO_CURR) void get_ext_level(hamlib_token_t token, vfo_t vfo = RIG_VFO_CURR)
{ value_t val = {0}; self->error_status = rig_get_level(self->rig, vfo, token, &val); { value_t val = {0}; self->error_status = rig_get_level(self->rig, vfo, token, &val);
//if (RIG_LEVEL_IS_FLOAT(level)) //if (RIG_LEVEL_IS_FLOAT(level))
/* TODO: dynamic casting */ /* TODO: dynamic casting */
@ -566,7 +566,7 @@ typedef channel_t * const_channel_t_p;
/* TODO: dynamic casting */ /* TODO: dynamic casting */
} }
void get_ext_parm(token_t parm) void get_ext_parm(hamlib_token_t parm)
{ value_t val = {0}; self->error_status = rig_get_parm(self->rig, parm, &val); { value_t val = {0}; self->error_status = rig_get_parm(self->rig, parm, &val);
//if (RIG_LEVEL_IS_FLOAT(parm)) //if (RIG_LEVEL_IS_FLOAT(parm))
/* TODO: dynamic casting */ /* TODO: dynamic casting */

8
bindings/rotator.swg
Wyświetl plik

@ -88,23 +88,23 @@ typedef struct Rot {
ROTMETHOD1(token_lookup, const_char_string) /* conf */ ROTMETHOD1(token_lookup, const_char_string) /* conf */
void set_conf(const char *name, const char *val) { void set_conf(const char *name, const char *val) {
token_t tok = rot_token_lookup(self->rot, name); hamlib_token_t tok = rot_token_lookup(self->rot, name);
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;
else else
self->error_status = rot_set_conf(self->rot, tok, val); self->error_status = rot_set_conf(self->rot, tok, val);
} }
ROTMETHOD2(set_conf, token_t, const_char_string) ROTMETHOD2(set_conf, hamlib_token_t, const_char_string)
const char *get_conf(token_t tok) { const char *get_conf(hamlib_token_t tok) {
static char s[128] = ""; static char s[128] = "";
self->error_status = rot_get_conf(self->rot, tok, s); self->error_status = rot_get_conf(self->rot, tok, s);
return s; return s;
} }
const char *get_conf(const char *name) { const char *get_conf(const char *name) {
token_t tok = rot_token_lookup(self->rot, name); hamlib_token_t tok = rot_token_lookup(self->rot, name);
static char s[128] = ""; static char s[128] = "";
if (tok == RIG_CONF_END) if (tok == RIG_CONF_END)
self->error_status = -RIG_EINVAL; self->error_status = -RIG_EINVAL;