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

Sanitize rig_debug() output levels per docs. 

Set most rig_debug() calls to leve RIG_DEBUG_VERBOSE and only use other
levels when it makes sense.
Hamlib-1.2.14
Nate Bargmann 2011-06-03 16:09:25 -05:00
rodzic 65d201455d
commit 2808713233
3 zmienionych plików z 27 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
kenwood/elecraft.c
Wyświetl plik

@ -1,6 +1,7 @@
/*
* Hamlib Elecraft backend--support Elecraft extensions to Kenwood commands
* Copyright (C) 2010 by Nate Bargmann, n0nb@n0nb.us
* Copyright (C) 2010,2011 by Nate Bargmann, n0nb@n0nb.us
* Copyright (C) 2011 by Alexander Sack, Alexander Sack, pisymbol@gmail.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -100,7 +101,7 @@ int elecraft_open(RIG *rig)
if (err != RIG_OK)
return err;
rig_debug(RIG_DEBUG_ERR, "%s: K2 level is %d, %s\n", __func__,
rig_debug(RIG_DEBUG_VERBOSE, "%s: K2 level is %d, %s\n", __func__,
priv->k2_ext_lvl, elec_ext_id_str_lst[priv->k2_ext_lvl].id);
break;
@ -109,14 +110,14 @@ int elecraft_open(RIG *rig)
if (err != RIG_OK)
return err;
rig_debug(RIG_DEBUG_ERR, "%s: K2 level is %d, %s\n", __func__,
rig_debug(RIG_DEBUG_VERBOSE, "%s: K2 level is %d, %s\n", __func__,
priv->k2_ext_lvl, elec_ext_id_str_lst[priv->k2_ext_lvl].id);
err = elecraft_get_extension_level(rig, "K3", &priv->k3_ext_lvl);
if (err != RIG_OK)
return err;
rig_debug(RIG_DEBUG_ERR, "%s: K3 level is %d, %s\n", __func__,
rig_debug(RIG_DEBUG_VERBOSE, "%s: K3 level is %d, %s\n", __func__,
priv->k3_ext_lvl, elec_ext_id_str_lst[priv->k3_ext_lvl].id);
err = elecraft_get_firmware_revision_level(rig, "RVM", priv->k3_fw_rev);
@ -125,7 +126,7 @@ int elecraft_open(RIG *rig)
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unrecognized rig model %d\n",
rig_debug(RIG_DEBUG_WARN, "%s: unrecognized rig model %d\n",
__func__, rig->caps->rig_model);
return -RIG_EINVAL;
}
@ -152,13 +153,13 @@ int verify_kenwood_id(RIG *rig, char *id)
/* Check for an Elecraft K2|K3 which returns "017" */
err = kenwood_get_id(rig, id);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_TRACE, "%s: cannot get identification\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s: cannot get identification\n", __func__);
return err;
}
/* ID is 'ID017;' */
if (strlen(id) < 5) {
rig_debug(RIG_DEBUG_TRACE, "%s: unknown ID type (%s)\n", __func__, id);
rig_debug(RIG_DEBUG_VERBOSE, "%s: unknown ID type (%s)\n", __func__, id);
return -RIG_EPROTO;
}
@ -168,10 +169,10 @@ int verify_kenwood_id(RIG *rig, char *id)
idptr++;
if (strcmp("017", idptr) != 0) {
rig_debug(RIG_DEBUG_TRACE, "%s: Rig (%s) is not a K2 or K3\n", __func__, id);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%s) is not a K2 or K3\n", __func__, id);
return -RIG_EPROTO;
} else
rig_debug(RIG_DEBUG_TRACE, "%s: Rig ID is %s\n", __func__, id);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s\n", __func__, id);
return RIG_OK;
}
@ -192,7 +193,7 @@ int elecraft_get_extension_level(RIG *rig, const char *cmd, int *ext_level)
err = kenwood_safe_transaction(rig, cmd, buf, KENWOOD_MAX_BUF_LEN, 4);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: Cannot get K2|K3 ID\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Cannot get K2|K3 ID\n", __func__);
return err;
}
@ -205,7 +206,7 @@ int elecraft_get_extension_level(RIG *rig, const char *cmd, int *ext_level)
if (strcmp(elec_ext_id_str_lst[i].id, bufptr) == 0) {
*ext_level = elec_ext_id_str_lst[i].level;
rig_debug(RIG_DEBUG_TRACE, "%s: %s extension level is %d, %s\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: %s extension level is %d, %s\n",
__func__, cmd, *ext_level, elec_ext_id_str_lst[i].id);
}
}
@ -229,7 +230,7 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd, char *fw_rev
err = kenwood_transaction(rig, cmd, sizeof(cmd), buf, &size);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: Cannot get firmeware revision level\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Cannot get firmeware revision level\n", __func__);
return err;
}
@ -245,7 +246,7 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd, char *fw_rev
/* Copy out */
strncpy(fw_rev, bufptr, sizeof(bufptr));
rig_debug(RIG_DEBUG_TRACE, "%s: Elecraft firmware revision is %s\n", __func__, fw_rev);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Elecraft firmware revision is %s\n", __func__, fw_rev);
return RIG_OK;
}

12
kenwood/k2.c
Wyświetl plik

@ -104,7 +104,7 @@ const struct rig_caps k2_caps = {
.rig_model = RIG_MODEL_K2,
.model_name = "K2",
.mfg_name = "Elecraft",
.version = "20110218",
.version = "20110603",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -387,7 +387,7 @@ int k2_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
tmp[4] = '\0';
*width = atoi(tmp);
rig_debug(RIG_DEBUG_TRACE, "%s: Mode: %d, Width: %04li\n", __func__, *mode, *width);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Mode: %d, Width: %04li\n", __func__, *mode, *width);
return RIG_OK;
}
@ -429,7 +429,7 @@ int k2_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported get_ext_level %d\n",
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %d\n",
__func__, token);
return -RIG_EINVAL;
}
@ -477,7 +477,7 @@ int k2_probe_mdfw(RIG *rig, struct kenwood_priv_data *priv)
strcpy(fw, buf);
rig_debug(RIG_DEBUG_TRACE, "%s: Mode value: %s, Filter Width value: %s\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: Mode value: %s, Filter Width value: %s\n",
__func__, mode, fw);
/* Now begin the process of querying the available modes and filters. */
@ -496,7 +496,7 @@ int k2_probe_mdfw(RIG *rig, struct kenwood_priv_data *priv)
priv->k2_md_rtty = 1; /* set flag for RTTY mode installed */
else
priv->k2_md_rtty = 0; /* RTTY module not installed */
rig_debug(RIG_DEBUG_TRACE, "%s: RTTY flag is: %d\n", __func__, priv->k2_md_rtty);
rig_debug(RIG_DEBUG_VERBOSE, "%s: RTTY flag is: %d\n", __func__, priv->k2_md_rtty);
i = (priv->k2_md_rtty == 1) ? 2 : 1;
@ -621,7 +621,7 @@ int k2_pop_fw_lst(RIG *rig, const char *cmd)
tmp[1] = '\0';
flt->filt_list[f-1].afslot = atoi(tmp);
rig_debug(RIG_DEBUG_TRACE, "%s: Width: %04li, FSlot: %i, AFSlot %i\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: Width: %04li, FSlot: %i, AFSlot %i\n",
__func__, flt->filt_list[f-1].width, flt->filt_list[f-1].fslot, flt->filt_list[f-1].afslot);
}

14
kenwood/k3.c
Wyświetl plik

@ -90,7 +90,7 @@ const struct rig_caps k3_caps = {
.rig_model = RIG_MODEL_K3,
.model_name = "K3/KX3",
.mfg_name = "Elecraft",
.version = "20110522",
.version = "20110603",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -253,7 +253,7 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (temp_m == RIG_MODE_RTTY) {
err = kenwood_safe_transaction(rig, "DT", buf, KENWOOD_MAX_BUF_LEN, 4);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: Cannot read K3 DT value\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: Cannot read K3 DT value\n",
__func__);
return err;
}
@ -265,14 +265,14 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*mode = RIG_MODE_RTTY;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported data sub-mode %c\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: unsupported data sub-mode %c\n",
__func__, buf[2]);
return -RIG_EINVAL;
}
} else if (temp_m == RIG_MODE_RTTYR) {
err = kenwood_safe_transaction(rig, "DT", buf, KENWOOD_MAX_BUF_LEN, 4);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: Cannot read K3 DT value\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: Cannot read K3 DT value\n",
__func__);
return err;
}
@ -284,7 +284,7 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*mode = RIG_MODE_RTTYR;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported data sub-mode %c\n",
rig_debug(RIG_DEBUG_VERBOSE, "%s: unsupported data sub-mode %c\n",
__func__, buf[2]);
return -RIG_EINVAL;
}
@ -297,7 +297,7 @@ int k3_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
*/
err = kenwood_safe_transaction(rig, "BW", buf, KENWOOD_MAX_BUF_LEN, 7);
if (err != RIG_OK) {
rig_debug(RIG_DEBUG_ERR, "%s: Cannot read K3 BW value\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Cannot read K3 BW value\n", __func__);
return err;
}
*width = atoi(&buf[2]) * 10;
@ -451,7 +451,7 @@ int k3_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
}
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: Unsupported get_ext_level %d\n",
rig_debug(RIG_DEBUG_WARN, "%s: Unsupported get_ext_level %d\n",
__func__, token);
return -RIG_EINVAL;
}