[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 70f27a0a03481ba607e1c
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 70f27a0a03481ba607e1caad4d92c32373a1b6e1
|
From: Michael B. <mdb...@us...> - 2021-01-17 14:09:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via 70f27a0a03481ba607e1caad4d92c32373a1b6e1 (commit)
via 00a48edf5d52c45ce7a28e8880720bcd0ddf1216 (commit)
via 6e28ec4ec42da96bfb03dd070a5ed3f689961c82 (commit)
via 544777f935074cc3e8da7903d55bd29a34b50b36 (commit)
via c5c60f0f430a0a254f527e196aa542f83dcddffd (commit)
via 4b9ea6b1d436ab97d9141a230b744ebe488db6a6 (commit)
via 460e748742135825d93e15f7154c66827b86b916 (commit)
from a5ca77a66f8066cc734a5e077ae078dccf1c9870 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 70f27a0a03481ba607e1caad4d92c32373a1b6e1
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Jan 17 08:09:06 2021 -0600
Improve comment in misc.c
diff --git a/src/misc.c b/src/misc.c
index caa02e98..9dfdbe46 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1637,7 +1637,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
// Handle device names 1st
if (strstr(hoststr, "/dev")) { return -1; }
- if (strstr(hoststr, "/")) { return -1; } // posible path -- no hostname starts with /
+ if (strstr(hoststr, "/")) { return -1; } // probably a path so not a hoststr
if (strncasecmp(hoststr, "com", 3) == 0) { return -1; }
commit 00a48edf5d52c45ce7a28e8880720bcd0ddf1216
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Jan 17 08:08:34 2021 -0600
Increase retries and timeout on flrig.c
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index b9a876e9..10f2dda1 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20210116"
+#define BACKEND_VER "20210117"
#define EOM "\r"
#define TRUE 1
commit 6e28ec4ec42da96bfb03dd070a5ed3f689961c82
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Jan 17 08:08:14 2021 -0600
Increase retries and timeout on flrig.c
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 4f50ecac..41f09cbb 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -125,7 +125,7 @@ const struct rig_caps flrig_caps =
.port_type = RIG_PORT_NETWORK,
.write_delay = 0,
.post_write_delay = 0,
- .timeout = 2000,
+ .timeout = 5000,
.retry = 5,
.has_get_func = RIG_FUNC_NONE,
@@ -518,7 +518,7 @@ static int flrig_transaction(RIG *rig, char *cmd, char *cmd_arg, char *value,
int value_len)
{
char xml[MAXXMLLEN];
- int retry = 2;
+ int retry = 5;
if (value)
{
commit 544777f935074cc3e8da7903d55bd29a34b50b36
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Jan 17 07:32:42 2021 -0600
Fixed ENTER func error
diff --git a/src/rig.c b/src/rig.c
index 38cf5667..a9fbd91e 100755
--- a/src/rig.c
+++ b/src/rig.c
@@ -2122,7 +2122,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
int retcode;
freq_t curr_freq;
- ENTER;
+ ENTERFUNC;
rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo));
if (CHECK_RIG_ARG(rig))
commit c5c60f0f430a0a254f527e196aa542f83dcddffd
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Jan 17 07:25:28 2021 -0600
First phase of improving debug messages
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 0aec7db7..79e8529e 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -354,13 +354,6 @@ static const yaesu_newcat_commands_t valid_commands[] =
int valid_commands_count = sizeof(valid_commands) / sizeof(
yaesu_newcat_commands_t);
-static void errmsg(int err, const char *func, const char *file, int line,
- char *s)
-{
- rig_debug(RIG_DEBUG_ERR, "%s(%s:%d): %s: %s\b", __func__, file, line, s,
- rigerror(err));
-}
-
/*
* configuration Tokens
*
@@ -430,7 +423,7 @@ static int newcat_band_index(freq_t freq)
else if (freq >= MHz(0.5) && freq < MHz(1.705)) { band = 12; } // MW Medium Wave
rig_debug(RIG_DEBUG_TRACE, "%s: freq=%g, band=%d\n", __func__, freq, band);
- return band;
+ RETURNFUNC(band);
}
/*
@@ -450,14 +443,14 @@ int newcat_init(RIG *rig)
{
struct newcat_priv_data *priv;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
rig->state.priv = (struct newcat_priv_data *) calloc(1,
sizeof(struct newcat_priv_data));
if (!rig->state.priv) /* whoops! memory shortage! */
{
- return -RIG_ENOMEM;
+ RETURNFUNC(-RIG_ENOMEM);
}
priv = rig->state.priv;
@@ -474,7 +467,7 @@ int newcat_init(RIG *rig)
priv->current_mem = NC_MEM_CHANNEL_NONE;
priv->fast_set_commands = FALSE;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -488,7 +481,7 @@ int newcat_init(RIG *rig)
int newcat_cleanup(RIG *rig)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (rig->state.priv)
{
@@ -497,7 +490,7 @@ int newcat_cleanup(RIG *rig)
rig->state.priv = NULL;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -513,7 +506,7 @@ int newcat_open(RIG *rig)
struct newcat_priv_data *priv = rig->state.priv;
struct rig_state *rig_s = &rig->state;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
rig_debug(RIG_DEBUG_TRACE, "%s: write_delay = %i msec\n",
__func__, rig_s->rigport.write_delay);
@@ -573,8 +566,7 @@ int newcat_open(RIG *rig)
#endif
- rig_debug(RIG_DEBUG_VERBOSE, "%s: returning RIG_OK\n", __func__);
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -588,7 +580,7 @@ int newcat_close(RIG *rig)
struct newcat_priv_data *priv = rig->state.priv;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!no_restore_ai && priv->trn_state >= 0)
{
@@ -598,7 +590,7 @@ int newcat_close(RIG *rig)
supported */
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -613,11 +605,13 @@ int newcat_set_conf(RIG *rig, token_t token, const char *val)
int ret = RIG_OK;
struct newcat_priv_data *priv;
+ ENTERFUNC;
+
priv = (struct newcat_priv_data *)rig->state.priv;
if (priv == NULL)
{
- return -RIG_EINTERNAL;
+ RETURNFUNC(-RIG_EINTERNAL);
}
switch (token)
@@ -631,7 +625,7 @@ int newcat_set_conf(RIG *rig, token_t token, const char *val)
if (end == val)
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if ((value == 0) || (value == 1))
@@ -640,7 +634,7 @@ int newcat_set_conf(RIG *rig, token_t token, const char *val)
}
else
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
break;
@@ -649,7 +643,7 @@ int newcat_set_conf(RIG *rig, token_t token, const char *val)
ret = -RIG_EINVAL;
}
- return ret;
+ RETURNFUNC(ret);
}
@@ -664,11 +658,13 @@ int newcat_get_conf(RIG *rig, token_t token, char *val)
int ret = RIG_OK;
struct newcat_priv_data *priv;
+ ENTERFUNC;
+
priv = (struct newcat_priv_data *)rig->state.priv;
if (priv == NULL)
{
- return -RIG_EINTERNAL;
+ RETURNFUNC(-RIG_EINTERNAL);
}
switch (token)
@@ -676,7 +672,7 @@ int newcat_get_conf(RIG *rig, token_t token, char *val)
case TOK_FAST_SET_CMD:
if (sizeof(val) < 2)
{
- return -RIG_ENOMEM;
+ RETURNFUNC(-RIG_ENOMEM);
}
sprintf(val, "%d", priv->fast_set_commands);
@@ -686,7 +682,7 @@ int newcat_get_conf(RIG *rig, token_t token, char *val)
ret = -RIG_EINVAL;
}
- return ret;
+ RETURNFUNC(ret);
}
@@ -710,16 +706,16 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
struct newcat_priv_data *priv;
int special_60m = 0;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, "FA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (!newcat_valid_command(rig, "FB"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
priv = (struct newcat_priv_data *)rig->state.priv;
@@ -733,7 +729,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (err < 0)
{
- errmsg(err, __func__, __FILE__, __LINE__, "newcat_set_vfo_from_alias");
+ ERRMSG(err, "newcat_set_vfo_from_alias");
return err;
}
@@ -761,7 +757,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
rig_debug(RIG_DEBUG_TRACE, "%s: 60M VFO_MEM exception, no freq change done\n",
__func__);
- return RIG_OK; /* make it look like we changed */
+ RETURNFUNC(RIG_OK); /* make it look like we changed */
}
c = 'A';
@@ -783,7 +779,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK != (err = newcat_get_cmd(rig)))
{
- errmsg(err, __func__, __FILE__, __LINE__, "newcat_get_cmd");
+ ERRMSG(err, "newcat_get_cmd");
return err;
}
@@ -794,7 +790,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK != (err = newcat_set_cmd(rig)))
{
- errmsg(err, __func__, __FILE__, __LINE__, "newcat_set_cmd failed");
+ ERRMSG(err,"newcat_set_cmd failed");
return err;
}
}
@@ -922,7 +918,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
rig_debug(RIG_DEBUG_VERBOSE,
"%s: freq after band select already set to %"PRIfreq"\n", __func__, freq);
- return RIG_OK; // we're done then!!
+ RETURNFUNC(RIG_OK); // we're done then!!
}
}
@@ -960,7 +956,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
}
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -979,17 +975,17 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char c;
int err;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = %s\n", __func__, rig_strvfo(vfo));
if (!newcat_valid_command(rig, "FA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (!newcat_valid_command(rig, "FB"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -1017,7 +1013,7 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported vfo=%s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL; /* sorry, unsupported VFO */
+ RETURNFUNC(-RIG_EINVAL); /* sorry, unsupported VFO */
}
/* Build the command string */
@@ -1025,7 +1021,7 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term);
@@ -1044,7 +1040,7 @@ int newcat_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
rig_debug(RIG_DEBUG_TRACE,
"%s: freq = %"PRIfreq" Hz for vfo %s\n", __func__, *freq, rig_strvfo(vfo));
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -1056,11 +1052,11 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
priv = (struct newcat_priv_data *)rig->state.priv;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, "MD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -1088,7 +1084,7 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (priv->cmd_str[3] == '0')
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
err = newcat_set_cmd(rig);
@@ -1135,11 +1131,11 @@ int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
int err;
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, "MD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -1214,12 +1210,13 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo)
priv->cache_start.tv_sec = 0; // invalidate the cache
- rig_debug(RIG_DEBUG_TRACE, "%s: called, passed vfo = %s\n", __func__,
+ ENTERFUNC;
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = %s\n", __func__,
rig_strvfo(vfo));
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_set_vfo_from_alias(rig,
@@ -1293,7 +1290,7 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo)
/* Set current_vfo now */
state->current_vfo = vfo;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
default:
return -RIG_ENIMPL; /* sorry, VFO not implemented */
@@ -1316,7 +1313,7 @@ int newcat_set_vfo(RIG *rig, vfo_t vfo)
rig_debug(RIG_DEBUG_TRACE, "%s: rig->state.current_vfo = %s\n", __func__,
rig_strvfo(vfo));
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Either returns a valid RIG_VFO* or if < 0 an error code
@@ -1324,6 +1321,7 @@ static vfo_t newcat_set_vfo_if_needed(RIG *rig, vfo_t vfo)
{
vfo_t oldvfo = rig->state.current_vfo;
+ ENTERFUNC;
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, oldvfo=%s\n", __func__, rig_strvfo(vfo),
rig_strvfo(oldvfo));
@@ -1336,7 +1334,7 @@ static vfo_t newcat_set_vfo_if_needed(RIG *rig, vfo_t vfo)
{
rig_debug(RIG_DEBUG_ERR, "%s: error setting vfo=%s\n", __func__,
rig_strvfo(vfo));
- return ret;
+ RETURNFUNC(ret);
}
}
@@ -1360,17 +1358,17 @@ int newcat_get_vfo(RIG *rig, vfo_t *vfo)
vfo_t vfo_mode;
char const *command = "VS";
+ ENTERFUNC;
+
if (!vfo)
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
-
/* Build the command string */
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s;", command);
@@ -1422,7 +1420,7 @@ int newcat_get_vfo(RIG *rig, vfo_t *vfo)
rig_debug(RIG_DEBUG_TRACE, "%s: rig->state.current_vfo = %s\n", __func__,
rig_strvfo(state->current_vfo));
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -1433,11 +1431,13 @@ int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
char txon[] = "TX1;";
char txoff[] = "TX0;";
+ ENTERFUNC;
+
priv->cache_start.tv_sec = 0; // invalidate the cache
if (!newcat_valid_command(rig, "TX"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
switch (ptt)
@@ -1464,7 +1464,7 @@ int newcat_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
return err;
@@ -1477,9 +1477,11 @@ int newcat_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
char c;
int err;
+ ENTERFUNC;
+
if (!newcat_valid_command(rig, "TX"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", "TX", cat_term);
@@ -1510,15 +1512,15 @@ int newcat_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
return -RIG_EPROTO;
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
int newcat_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -1530,9 +1532,11 @@ int newcat_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
char command[] = "OS";
char main_sub_vfo = '0';
+ ENTERFUNC;
+
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
/* Main or SUB vfo */
@@ -1563,7 +1567,7 @@ int newcat_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
@@ -1581,11 +1585,11 @@ int newcat_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
char command[] = "OS";
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
/* Set Main or SUB vfo */
@@ -1627,10 +1631,10 @@ int newcat_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -1641,7 +1645,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
char command[32];
freq_t freq = 0;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
@@ -1673,7 +1677,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1695,7 +1699,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1717,7 +1721,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1747,7 +1751,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m to 70cm bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1769,7 +1773,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1791,7 +1795,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1813,7 +1817,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1839,7 +1843,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
else
{
// only valid on 10m and 6m bands
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
// Step size is 1 kHz
@@ -1850,7 +1854,7 @@ int newcat_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs)
}
else
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
return newcat_set_cmd(rig);
@@ -1866,7 +1870,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
freq_t freq = 0;
int step;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_get_freq(rig, vfo, &freq); // Need to get freq to determine band
@@ -1896,7 +1900,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -1916,7 +1920,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -1936,7 +1940,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -1964,7 +1968,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m to 70cm bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -1984,7 +1988,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -2004,7 +2008,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -2024,7 +2028,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -2052,7 +2056,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
{
// only valid on 10m and 6m bands
*offs = 0;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
// Step size is 1 kHz
@@ -2060,7 +2064,7 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
}
else
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_get_cmd(rig);
@@ -2079,41 +2083,41 @@ int newcat_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *offs)
*offs = atoi(retoffs) * step;
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
int newcat_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode,
pbwidth_t tx_width)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
pbwidth_t *tx_width)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -2122,7 +2126,7 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
int err;
vfo_t rx_vfo;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -2194,10 +2198,10 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2205,7 +2209,7 @@ int newcat_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
{
int err;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -2235,7 +2239,7 @@ int newcat_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
rig_strvfo(vfo),
rig_strvfo(*tx_vfo));
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
int newcat_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
@@ -2244,9 +2248,11 @@ int newcat_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
vfo_t oldvfo;
int ret;
+ ENTERFUNC;
+
if (!newcat_valid_command(rig, "RT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
oldvfo = newcat_set_vfo_if_needed(rig, vfo);
@@ -2284,7 +2290,7 @@ int newcat_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (oldvfo < 0) { return oldvfo; }
- return ret;
+ RETURNFUNC(ret);
}
@@ -2296,6 +2302,8 @@ int newcat_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
int offset = 0;
char *cmd = "IF";
+ ENTERFUNC;
+
if (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB)
{
cmd = "OI";
@@ -2303,13 +2311,11 @@ int newcat_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
if (!newcat_valid_command(rig, cmd))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
*rit = 0;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
-
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", cmd, cat_term);
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str);
@@ -2346,7 +2352,7 @@ int newcat_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
// return the current offset even if turned off
*rit = (shortfreq_t) atoi(retval);
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2356,9 +2362,11 @@ int newcat_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
vfo_t oldvfo;
int ret;
+ ENTERFUNC;
+
if (!newcat_valid_command(rig, "XT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
oldvfo = newcat_set_vfo_if_needed(rig, vfo);
@@ -2397,7 +2405,7 @@ int newcat_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
if (oldvfo < 0) { return oldvfo; }
- return ret;
+ RETURNFUNC(ret);
}
@@ -2409,6 +2417,8 @@ int newcat_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
int offset = 0;
char *cmd = "IF";
+ ENTERFUNC;
+
if (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB)
{
cmd = "OI";
@@ -2416,13 +2426,11 @@ int newcat_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
if (!newcat_valid_command(rig, cmd))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
*xit = 0;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
-
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", cmd, cat_term);
rig_debug(RIG_DEBUG_TRACE, "%s: cmd_str = %s\n", __func__, priv->cmd_str);
@@ -2459,7 +2467,7 @@ int newcat_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
// return the offset even when turned off
*xit = (shortfreq_t) atoi(retval);
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2470,7 +2478,7 @@ int newcat_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
rmode_t mode;
ncboolean ts_match;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_get_mode(rig, vfo, &mode, &width);
@@ -2507,11 +2515,11 @@ int newcat_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
if (ts_match)
{
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
else
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
}
@@ -2524,7 +2532,8 @@ int newcat_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
ncboolean ts_match;
ncboolean fast_step = FALSE;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+ ENTERFUNC;
err = newcat_get_mode(rig, vfo, &mode, &width);
@@ -2563,44 +2572,44 @@ int newcat_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
if (ts_match)
{
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
else
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
}
int newcat_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_set_tone(RIG *rig, vfo_t vfo, tone_t tone)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_tone(RIG *rig, vfo_t vfo, tone_t *tone)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -2612,16 +2621,16 @@ int newcat_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
ncboolean tone_match;
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, "CN"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (!newcat_valid_command(rig, "CT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -2648,7 +2657,7 @@ int newcat_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
if (tone_match == FALSE && tone != 0)
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (tone == 0) /* turn off ctcss */
@@ -2684,11 +2693,11 @@ int newcat_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
char cmd[] = "CN";
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, cmd))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -2731,44 +2740,44 @@ int newcat_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
if (t < 0 || t > 49)
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
*tone = rig->caps->ctcss_list[t];
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
int newcat_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_dcs_sql(RIG *rig, vfo_t vfo, tone_t *code)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_set_tone_sql(RIG *rig, vfo_t vfo, tone_t tone)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
int newcat_get_tone_sql(RIG *rig, vfo_t vfo, tone_t *tone)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -2776,7 +2785,7 @@ int newcat_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
{
int err;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_set_ctcss_tone(rig, vfo, tone);
@@ -2796,7 +2805,7 @@ int newcat_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
}
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2804,7 +2813,7 @@ int newcat_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
{
int err;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
err = newcat_get_ctcss_tone(rig, vfo, tone);
@@ -2817,9 +2826,9 @@ int newcat_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq,
{
int rig_id;
- rig_id = newcat_get_rigid(rig);
+ ENTERFUNC;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ rig_id = newcat_get_rigid(rig);
switch (rig_id)
{
@@ -2895,7 +2904,7 @@ int newcat_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq,
*mwpower);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2904,9 +2913,9 @@ int newcat_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq,
{
int rig_id;
- rig_id = newcat_get_rigid(rig);
+ ENTERFUNC;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ rig_id = newcat_get_rigid(rig);
switch (rig_id)
{
@@ -2981,7 +2990,7 @@ int newcat_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq,
*power);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -2994,11 +3003,11 @@ int newcat_set_powerstat(RIG *rig, powerstat_t status)
int retry_save;
char ps;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, "PS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
switch (status)
@@ -3017,7 +3026,7 @@ int newcat_set_powerstat(RIG *rig, powerstat_t status)
break;
default:
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PS%c%c", ps, cat_term);
@@ -3038,7 +3047,7 @@ int newcat_set_powerstat(RIG *rig, powerstat_t status)
if (retval == RIG_OK)
{
rig->state.rigport.retry = retry_save;
- return retval;
+ RETURNFUNC(retval);
}
rig_debug(RIG_DEBUG_TRACE, "%s: Wait #%d for power up\n", __func__, i + 1);
@@ -3055,7 +3064,7 @@ int newcat_set_powerstat(RIG *rig, powerstat_t status)
retval = -RIG_ETIMEOUT;
}
- return retval;
+ RETURNFUNC(retval);
}
@@ -3069,13 +3078,13 @@ int newcat_get_powerstat(RIG *rig, powerstat_t *status)
char ps;
char command[] = "PS";
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
*status = RIG_POWER_OFF;
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term);
@@ -3099,18 +3108,18 @@ int newcat_get_powerstat(RIG *rig, powerstat_t *status)
break;
default:
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
int newcat_reset(RIG *rig, reset_t reset)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
@@ -3122,9 +3131,11 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
char command[] = "AN";
char main_sub_vfo = '0';
+ ENTERFUNC;
+
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
/* Main or SUB vfo */
@@ -3153,12 +3164,12 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
case RIG_ANT_3:
if (newcat_is_rig(rig, RIG_MODEL_FT950))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (newcat_is_rig(rig, RIG_MODEL_FTDX1200))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
which_ant = '3';
@@ -3167,12 +3178,12 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
case RIG_ANT_4:
if (newcat_is_rig(rig, RIG_MODEL_FT950))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (newcat_is_rig(rig, RIG_MODEL_FTDX1200))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
which_ant = '4';
@@ -3181,12 +3192,12 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
case RIG_ANT_5:
if (newcat_is_rig(rig, RIG_MODEL_FT950))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (newcat_is_rig(rig, RIG_MODEL_FTDX1200))
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
/* RX only, on FT-2000/FT-5000/FT-9000 */
@@ -3194,7 +3205,7 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c%c", command,
@@ -3212,11 +3223,11 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
char command[] = "AN";
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!newcat_valid_command(rig, command))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
/* Set Main or SUB vfo */
@@ -3270,7 +3281,7 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
return -RIG_EPROTO;
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -3285,7 +3296,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
char main_sub_vfo = '0';
char *format;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
/* Set Main or SUB vfo */
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -3305,7 +3316,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_RFPOWER:
if (!newcat_valid_command(rig, "PC"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft950 || is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991
@@ -3339,7 +3350,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_AF:
if (!newcat_valid_command(rig, "AG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
fpf = newcat_scale_float(255, val.f);
@@ -3350,7 +3361,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_AGC:
if (!newcat_valid_command(rig, "GT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
switch (val.i)
@@ -3376,7 +3387,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
@@ -3393,7 +3404,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!newcat_valid_command(rig, "IS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -3456,7 +3467,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!newcat_valid_command(rig, "KP"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (val.i < 300)
@@ -3489,7 +3500,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_KEYSPD:
if (!newcat_valid_command(rig, "KS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KS%03d%c", val.i, cat_term);
@@ -3502,7 +3513,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!newcat_valid_command(rig, "MG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -3537,7 +3548,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_METER:
if (!newcat_valid_command(rig, "MS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ftdx101) // new format for the command with VFO selection
@@ -3564,7 +3575,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_METER_PO:
if (newcat_is_rig(rig, RIG_MODEL_FT950))
{
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
else
{
@@ -3587,7 +3598,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
rig_debug(RIG_DEBUG_ERR, "%s: unknown val.i=%d\n", __func__, val.i);
- default: return -RIG_EINVAL;
+ default: RETURNFUNC(-RIG_EINVAL);
}
break;
@@ -3595,7 +3606,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_PREAMP:
if (!newcat_valid_command(rig, "PA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (val.i == 0)
@@ -3623,7 +3634,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (strlen(priv->cmd_str) == 0)
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
@@ -3636,7 +3647,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_ATT:
if (!newcat_valid_command(rig, "RA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (val.i == 0)
@@ -3664,7 +3675,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (strlen(priv->cmd_str) == 0)
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
@@ -3677,7 +3688,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_RF:
if (!newcat_valid_command(rig, "RG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft891)
@@ -3697,7 +3708,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_NR:
if (!newcat_valid_command(rig, "RL"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (newcat_is_rig(rig, RIG_MODEL_FT450))
@@ -3743,7 +3754,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_COMP:
if (!newcat_valid_command(rig, "PL"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft2000 || is_ftdx9000 || is_ftdx5000)
@@ -3766,7 +3777,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!newcat_valid_command(rig, "SD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
// Convert 10/ths of dots to milliseconds using the current key speed
@@ -3859,7 +3870,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_SQL:
if (!newcat_valid_command(rig, "SQ"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft891 || is_ft991 || is_ftdx101 || is_ftdx10)
@@ -3879,7 +3890,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_VOXDELAY:
if (!newcat_valid_command(rig, "VD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
/* VOX delay, api int (tenth of seconds), ms for rig */
@@ -3939,7 +3950,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_VOXGAIN:
if (!newcat_valid_command(rig, "VG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft2000 || is_ftdx9000 || is_ftdx5000)
@@ -3993,7 +4004,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
else
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
break;
@@ -4001,7 +4012,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_NOTCHF:
if (!newcat_valid_command(rig, "BP"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
val.i = val.i / 10;
@@ -4060,7 +4071,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_MONITOR_GAIN:
if (!newcat_valid_command(rig, "ML"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ftdx1200 || is_ftdx3000 || is_ft891 || is_ft991 || is_ftdx101
@@ -4085,7 +4096,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
err = newcat_set_cmd(rig);
@@ -4109,7 +4120,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
char main_sub_vfo = '0';
int i;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
/* Set Main or SUB vfo */
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -4129,7 +4140,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER:
if (!newcat_valid_command(rig, "PC"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PC%c", cat_term);
@@ -4138,7 +4149,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_PREAMP:
if (!newcat_valid_command(rig, "PA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PA0%c", cat_term);
@@ -4153,7 +4164,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AF:
if (!newcat_valid_command(rig, "AG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AG%c%c", main_sub_vfo,
@@ -4163,7 +4174,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_AGC:
if (!newcat_valid_command(rig, "GT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "GT%c%c", main_sub_vfo,
@@ -4177,7 +4188,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (!newcat_valid_command(rig, "IS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -4209,7 +4220,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_CWPITCH:
if (!newcat_valid_command(rig, "KP"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KP%c", cat_term);
@@ -4218,7 +4229,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_KEYSPD:
if (!newcat_valid_command(rig, "KS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KS%c", cat_term);
@@ -4231,7 +4242,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (!newcat_valid_command(rig, "MG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -4256,7 +4267,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_METER:
if (!newcat_valid_command(rig, "MS"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MS%c", cat_term);
@@ -4265,7 +4276,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_ATT:
if (!newcat_valid_command(rig, "RA"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RA0%c", cat_term);
@@ -4280,7 +4291,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RF:
if (!newcat_valid_command(rig, "RG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RG%c%c", main_sub_vfo,
@@ -4290,7 +4301,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_COMP:
if (!newcat_valid_command(rig, "PL"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "PL%c", cat_term);
@@ -4299,7 +4310,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_NR:
if (!newcat_valid_command(rig, "RL"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RL0%c", cat_term);
@@ -4314,7 +4325,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_BKINDL:
if (!newcat_valid_command(rig, "SD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SD%c", cat_term);
@@ -4323,7 +4334,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_SQL:
if (!newcat_valid_command(rig, "SQ"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SQ%c%c", main_sub_vfo,
@@ -4335,7 +4346,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
/* VOX delay, arg int (tenth of seconds) */
if (!newcat_valid_command(rig, "VD"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VD%c", cat_term);
@@ -4344,7 +4355,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_VOXGAIN:
if (!newcat_valid_command(rig, "VG"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VG%c", cat_term);
@@ -4357,7 +4368,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RAWSTR:
if (!newcat_valid_command(rig, "SM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SM%c%c", main_sub_vfo,
@@ -4367,7 +4378,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_SWR:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM6%c", cat_term);
@@ -4376,7 +4387,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_ALC:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM4%c", cat_term);
@@ -4386,7 +4397,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER_METER_WATTS:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ftdx9000)
@@ -4403,7 +4414,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_COMP_METER:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM3%c", cat_term);
@@ -4412,7 +4423,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_VD_METER:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM8%c", cat_term);
@@ -4421,7 +4432,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_ID_METER:
if (!newcat_valid_command(rig, "RM"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM7%c", cat_term);
@@ -4462,7 +4473,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
else
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
break;
@@ -4470,7 +4481,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_NOTCHF:
if (!newcat_valid_command(rig, "BP"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BP01%c", cat_term);
@@ -4489,7 +4500,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_MONITOR_GAIN:
if (!newcat_valid_command(rig, "ML"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ftdx9000)
@@ -4504,7 +4515,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
err = newcat_get_cmd(rig);
@@ -5024,10 +5035,10 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
default:
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
- return RIG_OK;
+ RETURNFUNC(RIG_OK);
}
@@ -5037,7 +5048,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
int err;
char main_sub_vfo = '0';
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
/* Set Main or SUB vfo */
err = newcat_set_vfo_from_alias(rig, &vfo);
@@ -5061,7 +5072,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
if (!newcat_valid_command(rig, "BC"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -5096,7 +5107,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
if (!newcat_valid_command(rig, "BP"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -5127,7 +5138,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_FBKIN:
if (!newcat_valid_command(rig, "BI"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "BI%d%c", status ? 1 : 0,
@@ -5137,7 +5148,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_TONE:
if (!newcat_valid_command(rig, "CT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%d%c", status ? 2 : 0,
@@ -5153,7 +5164,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_TSQL:
if (!newcat_valid_command(rig, "CT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "CT0%d%c", status ? 1 : 0,
@@ -5169,7 +5180,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_LOCK:
if (!newcat_valid_command(rig, "LK"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ftdx1200 || is_ftdx3000 || is_ftdx5000 || is_ftdx101)
@@ -5189,7 +5200,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_MON:
if (!newcat_valid_command(rig, "ML"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "ML0%03d%c", status ? 1 : 0,
@@ -5199,7 +5210,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_NB:
if (!newcat_valid_command(rig, "NB"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NB0%d%c", status ? 1 : 0,
@@ -5219,7 +5230,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
if (!newcat_valid_command(rig, "NR"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -5254,7 +5265,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
if (!newcat_valid_command(rig, "PR"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
@@ -5291,7 +5302,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_VOX:
if (!newcat_valid_command(rig, "VX"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VX%d%c", status ? 1 : 0,
@@ -5301,7 +5312,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_TUNER:
if (!newcat_valid_command(rig, "AC"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "AC00%d%c",
@@ -5312,7 +5323,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_RIT:
if (!newcat_valid_command(rig, "RT"))
{
- return -RIG_ENAVAIL;
+ RETURNFUNC(-RIG_ENAVAIL);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RT%d%c", status ? 1 : 0,
@@ -5322,7 +5333,7 @@ int newcat_set_func(RIG *rig, vfo_t ...
[truncated message content] |
