EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

pvtools: update options message

Browse Source
This commit is contained in:
Michael Davidsaver
2018-10-30 13:44:46 -07:00
parent c2f386446a
commit a4e78916b7
4 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pvtoolsSrc/pvcall.cpp
View File

@ -26,18 +26,11 @@ namespace {
void callusage (void) void callusage (void)
{ {
fprintf (stderr, "\nUsage: " EXECNAME " [options] <PV name> [<arg1>=<value>]...\n\n" fprintf (stderr, "\nUsage: " EXECNAME " [options] <PV name> [<arg1>=<value>]...\n"
"\noptions:\n" "\n"
" -h: Help: Print this message\n" COMMON_OPTIONS
" -V: Print version and exit\n"
" -s <service name>: legacy form of PV name\n" " -s <service name>: legacy form of PV name\n"
" -a <service arg>: legacy form of argument\n" " -a <service arg=value>: legacy form of argument\n"
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n"
" -w <sec>: Wait time, specifies timeout, default is %f seconds for get, inf. for monitor\n"
" -p <provider>: Set default provider name, default is '%s'\n"
" -M <raw|nt|json>: Output mode. default is 'nt'\n"
" -v: Show entire structure (implies Raw mode)\n"
" -d: Enable debug output\n"
" deprecated options:\n" " deprecated options:\n"
" -q, -t, -i, -n, -F: ignored\n" " -q, -t, -i, -n, -F: ignored\n"
" -f <input file>: errors\n" " -f <input file>: errors\n"

24
pvtoolsSrc/pvget.cpp
View File

@ -43,21 +43,19 @@ int haderror;
void usage (void) void usage (void)
{ {
fprintf (stderr, "\nUsage: " EXECNAME " [options] <PV name>...\n\n" fprintf (stderr, "\nUsage: " EXECNAME " [options] <PV name>...\n"
"\noptions:\n" "\n"
" -h: Help: Print this message\n" COMMON_OPTIONS
" -V: Print version and exit\n"
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n"
" -w <sec>: Wait time, specifies timeout, default is %f seconds for get, inf. for monitor\n"
" -m: Monitor mode\n"
" -p <provider>: Set default provider name, default is '%s'\n"
" -M <raw|nt|json>: Output mode. default is 'nt'\n"
" -v: Show entire structure (implies Raw mode)\n"
" -d: Enable debug output\n"
" deprecated options:\n" " deprecated options:\n"
" -q, -t, -i, -n, -F: ignored\n" " -q, -t, -i, -n, -F: ignored\n"
" -f <input file>: errors\n" " -f <input file>: errors\n"
"\nexample: " EXECNAME " double01\n\n" " Output details:\n"
" -m -v: Monitor in Raw mode. Print only fields marked as changed.\n"
" -m -vv: Monitor in Raw mode. Highlight fields marked as changed, show all valid fields.\n"
" -m -vvv: Monitor in Raw mode. Highlight fields marked as changed, show all fields.\n"
" -vv: Get in Raw mode. Highlight valid fields, show all fields.\n"
"\n"
"example: " EXECNAME " double01\n\n"
, request.c_str(), timeout, defaultProvider.c_str()); , request.c_str(), timeout, defaultProvider.c_str());
} }
@ -365,7 +363,7 @@ int MAIN (int argc, char *argv[])
if(monitor) if(monitor)
timeout = -1; timeout = -1;
if(verbosity>0) if(verbosity>0 && outmode==pvd::PVStructure::Formatter::NT)
outmode = pvd::PVStructure::Formatter::Raw; outmode = pvd::PVStructure::Formatter::Raw;
pvd::PVStructure::shared_pointer pvRequest; pvd::PVStructure::shared_pointer pvRequest;

11
pvtoolsSrc/pvput.cpp
View File

@ -50,16 +50,7 @@ void usage (bool details=false)
#endif #endif
fprintf (stderr, fprintf (stderr,
"\n" "\n"
"\noptions:\n" COMMON_OPTIONS
" -h: Help: Print this message\n"
" -v: Print version and exit\n"
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n"
" -w <sec>: Wait time, specifies timeout, default is %f second(s)\n"
" -p <provider>: Set default provider name, default is '%s'\n"
" -M <raw|nt|json>: Output mode. default is 'nt'\n"
" -v: Show entire structure (implies Raw mode)\n"
" -q: Quiet mode, print only error messages\n"
" -d: Enable debug output\n"
" Deprecated options:\n" " Deprecated options:\n"
" default: Auto - try value as enum string, then as index number\n" " default: Auto - try value as enum string, then as index number\n"
" -n, -s, -F, -t: ignored\n" " -n, -s, -F, -t: ignored\n"

12
pvtoolsSrc/pvutils.h
View File

@ -22,6 +22,17 @@ typedef epicsGuardRelease<epicsMutex> UnGuard;
namespace pvd = epics::pvData; namespace pvd = epics::pvData;
namespace pva = epics::pvAccess; namespace pva = epics::pvAccess;
#define COMMON_OPTIONS \
"options:\n" \
" -h: Help: Print this message\n" \
" -V: Print version and exit\n" \
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n" \
" -w <sec>: Wait time, specifies timeout, default is %f second(s)\n" \
" -p <provider>: Set default provider name, default is '%s'\n" \
" -M <raw|nt|json>: Output mode. default is 'nt'\n" \
" -v: Show entire structure (implies Raw mode)\n" \
" -q: Quiet mode, print only error messages\n" \
" -d: Enable debug output\n"
extern double timeout; extern double timeout;
extern bool debugFlag; extern bool debugFlag;
@ -58,6 +69,7 @@ struct Tracker {
} }
static void prepare(); static void prepare();
EPICS_NOT_COPYABLE(Tracker)
}; };
void jarray(pvd::shared_vector<std::string>& out, const char *inp); void jarray(pvd::shared_vector<std::string>& out, const char *inp);