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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/115/head
Michael Black 2019-06-26 06:03:15 -05:00
rodzic 6b0dcc30c9 8465a76fd2
commit 76370c32f2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
2 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
icom/icom.c
Wyświetl plik

@ -1692,9 +1692,10 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_AGC: case RIG_LEVEL_AGC:
if (priv_caps->agc_levels_present) { if (priv_caps->agc_levels_present) {
int found = 0; int found = 0;
int i;
for (int i = 0; i <= RIG_AGC_LAST && priv_caps->agc_levels[i].level >= 0; i++) { for (i = 0; i <= RIG_AGC_LAST && priv_caps->agc_levels[i].level >= 0; i++) {
if (priv_caps->agc_levels[i].icom_level == icom_val) { if (priv_caps->agc_levels[i].icom_level == icom_val) {
val->i = priv_caps->agc_levels[i].level; val->i = priv_caps->agc_levels[i].level;
found = 1; found = 1;

3
tests/dumpcaps.c
Wyświetl plik

@ -723,6 +723,7 @@ int dumpcaps(RIG *rig, FILE *fout)
static int print_ext(RIG *rig, const struct confparams *cfp, rig_ptr_t ptr) static int print_ext(RIG *rig, const struct confparams *cfp, rig_ptr_t ptr)
{ {
int i;
fprintf((FILE *)ptr, "\t%s\n", cfp->name); fprintf((FILE *)ptr, "\t%s\n", cfp->name);
fprintf((FILE *)ptr, "\t\tType: %s\n", get_rig_conf_type(cfp->type)); fprintf((FILE *)ptr, "\t\tType: %s\n", get_rig_conf_type(cfp->type));
fprintf((FILE *)ptr, "\t\tDefault: %s\n", cfp->dflt != NULL ? cfp->dflt : ""); fprintf((FILE *)ptr, "\t\tDefault: %s\n", cfp->dflt != NULL ? cfp->dflt : "");
@ -736,7 +737,7 @@ static int print_ext(RIG *rig, const struct confparams *cfp, rig_ptr_t ptr)
case RIG_CONF_COMBO: case RIG_CONF_COMBO:
fprintf((FILE *)ptr, "\t\tValues:"); fprintf((FILE *)ptr, "\t\tValues:");
if (cfp->u.c.combostr != NULL) { if (cfp->u.c.combostr != NULL) {
for (int i = 0; i < RIG_COMBO_MAX && cfp->u.c.combostr[i] != NULL; i++) { for (i = 0; i < RIG_COMBO_MAX && cfp->u.c.combostr[i] != NULL; i++) {
fprintf((FILE *)ptr, " %d=\"%s\"", i, cfp->u.c.combostr[i]); fprintf((FILE *)ptr, " %d=\"%s\"", i, cfp->u.c.combostr[i]);
} }
} }