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

moved some sprintf's out of library into dumpcap application. 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1594 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.0
Stéphane Fillod, F8CFE 2003-11-16 17:34:00 +00:00
rodzic 915ca1e460
commit 916a21ad52
5 zmienionych plików z 19 dodań i 137 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

122
src/misc.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - toolbox
* Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton
*
* $Id: misc.c,v 1.28 2003-08-25 22:28:51 fillods Exp $
* $Id: misc.c,v 1.29 2003-11-16 17:34:00 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -292,125 +292,6 @@ const char *strstatus(enum rig_status_e status)
return "";
}
int sprintf_mode(char *str, rmode_t mode)
{
int i, len=0;
*str = '\0';
if (mode == RIG_MODE_NONE)
return 0;
for (i = 0; i < 30; i++) {
const char *ms = strrmode(mode & (1UL<<i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
int sprintf_func(char *str, setting_t func)
{
int i, len=0;
*str = '\0';
if (func == RIG_FUNC_NONE)
return 0;
for (i = 0; i < 60; i++) {
const char *ms = strfunc(func & rig_idx2setting(i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
int sprintf_level(char *str, setting_t level)
{
int i, len=0;
*str = '\0';
if (level == RIG_LEVEL_NONE)
return 0;
for (i = 0; i < 60; i++) {
const char *ms = strlevel(level & rig_idx2setting(i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
int sprintf_parm(char *str, setting_t parm)
{
int i, len=0;
*str = '\0';
if (parm == RIG_PARM_NONE)
return 0;
for (i = 0; i < 60; i++) {
const char *ms = strparm(parm & rig_idx2setting(i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
int sprintf_vfop(char *str, vfo_op_t op)
{
int i, len=0;
*str = '\0';
if (op == RIG_OP_NONE)
return 0;
for (i = 0; i < 30; i++) {
const char *ms = strvfop(op & (1UL<<i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
int sprintf_scan(char *str, scan_t rscan)
{
int i, len=0;
*str = '\0';
if (rscan == RIG_SCAN_NONE)
return 0;
for (i = 0; i < 30; i++) {
const char *ms = strscan(rscan & (1UL<<i));
if (!ms || !ms[0])
continue; /* unknown, FIXME! */
strcat(str, ms);
strcat(str, " ");
len += strlen(ms) + 1;
}
return len;
}
static struct {
rmode_t mode;
@ -583,6 +464,7 @@ static struct {
{ RIG_LEVEL_VOXGAIN, "VOXGAIN" },
{ RIG_LEVEL_ANTIVOX, "ANTIVOX" },
{ RIG_LEVEL_RAWSTR, "RAWSTR" },
{ RIG_LEVEL_SWR, "SWR" },
{ RIG_LEVEL_ALC, "ALC" },
{ RIG_LEVEL_SQLSTAT, "SQLSTAT" },

9
src/misc.h
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - toolbox header
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton
*
* $Id: misc.h,v 1.15 2002-10-07 21:57:17 fillods Exp $
* $Id: misc.h,v 1.16 2003-11-16 17:34:00 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -61,13 +61,6 @@ extern HAMLIB_EXPORT(unsigned char *) to_bcd_be(unsigned char bcd_data[], unsign
extern HAMLIB_EXPORT(unsigned long long) from_bcd_be(const unsigned char bcd_data[], unsigned bcd_len);
extern HAMLIB_EXPORT(int) sprintf_freq(char *str, freq_t);
extern HAMLIB_EXPORT(int) sprintf_mode(char *str, rmode_t);
extern HAMLIB_EXPORT(int) sprintf_vfo(char *str, vfo_t);
extern HAMLIB_EXPORT(int) sprintf_func(char *str, setting_t);
extern HAMLIB_EXPORT(int) sprintf_level(char *str, setting_t);
extern HAMLIB_EXPORT(int) sprintf_parm(char *str, setting_t);
extern HAMLIB_EXPORT(int) sprintf_vfop(char *str, vfo_op_t);
extern HAMLIB_EXPORT(int) sprintf_scan(char *str, scan_t);
extern HAMLIB_EXPORT(const char *) strrmode(rmode_t mode);
extern HAMLIB_EXPORT(const char *) strvfo(vfo_t vfo);
extern HAMLIB_EXPORT(const char *) strfunc(setting_t);

3
tests/Makefile.am
Wyświetl plik

@ -9,7 +9,8 @@ man_MANS = rigctl.1 rotctl.1
check_PROGRAMS = dumpmem testrig testtrn testbcd testfreq listrigs testloc rig_bench @RIGMATRIX@
rigctl_SOURCES = rigctl.c dumpcaps.c
rigctl_SOURCES = rigctl.c dumpcaps.c sprintflst.c
noinst_HEADERS = sprintflst.h
EXTRA_PROGRAMS = rigmatrix

17
tests/dumpcaps.c
Wyświetl plik

@ -3,7 +3,7 @@
* This programs dumps the capabilities of a backend rig.
*
*
* $Id: dumpcaps.c,v 1.39 2003-08-25 22:36:39 fillods Exp $
* $Id: dumpcaps.c,v 1.40 2003-11-16 17:34:00 fillods Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -22,6 +22,9 @@
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <string.h>
@ -30,6 +33,8 @@
#include <hamlib/rig.h>
#include "misc.h"
#include "sprintflst.h"
static int print_ext(RIG *rig, const struct confparams *cfp, rig_ptr_t ptr);
static const char *decode_mtype(chan_type_t type);
@ -46,7 +51,7 @@ int dumpcaps (RIG* rig)
int status,i;
char freqbuf[20];
int backend_warnings=0;
char prntbuf[256];
static char prntbuf[1024]; /* a malloc would be better.. */
if (!rig || !rig->caps)
return -RIG_EINVAL;
@ -217,10 +222,10 @@ int dumpcaps (RIG* rig)
sprintf_func(prntbuf, caps->has_set_func);
printf("Set functions: %s\n", prntbuf);
sprintf_level(prntbuf, caps->has_get_level);
sprintf_level_gran(prntbuf, caps->has_get_level, caps->level_gran);
printf("Get level: %s\n", prntbuf);
sprintf_level(prntbuf, caps->has_set_level);
sprintf_level_gran(prntbuf, caps->has_set_level, caps->level_gran);
printf("Set level: %s\n", prntbuf);
if (caps->has_set_level&RIG_LEVEL_READONLY_LIST) {
printf("Warning: backend can set readonly levels!\n");
@ -230,10 +235,10 @@ int dumpcaps (RIG* rig)
rig_ext_level_foreach(rig, print_ext, NULL);
printf("\n");
sprintf_parm(prntbuf, caps->has_get_parm);
sprintf_parm_gran(prntbuf, caps->has_get_parm, caps->parm_gran);
printf("Get parameters: %s\n", prntbuf);
sprintf_parm(prntbuf, caps->has_set_parm);
sprintf_parm_gran(prntbuf, caps->has_set_parm, caps->parm_gran);
printf("Set parameters: %s\n", prntbuf);
if (caps->has_set_parm&RIG_PARM_READONLY_LIST) {
printf("Warning: backend can set readonly parms!\n");

5
tests/rigctl.c
Wyświetl plik

@ -5,7 +5,7 @@
* It takes commands in interactive mode as well as
* from command line options.
*
* $Id: rigctl.c,v 1.47 2003-10-20 22:15:02 fillods Exp $
* $Id: rigctl.c,v 1.48 2003-11-16 17:34:00 fillods Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -39,6 +39,7 @@
#include <hamlib/rig.h>
#include "misc.h"
#include "sprintflst.h"
#ifdef _WIN32
#define LLFMT "L"
@ -863,7 +864,7 @@ declare_proto_rig(set_mode)
pbwidth_t width;
mode = parse_mode(arg1);
sscanf(arg2, "%d", (int*)&width);
sscanf(arg2, "%ld", &width);
return rig_set_mode(rig, vfo, mode, width);
}