Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d4291f0c577
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2506679909bc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2020

  1. glscopeclient: expanded --help text

    @azonenberg
    azonenberg committed Jun 3, 2020
    Copy the full SHA
    2506679 View commit details
Showing with 11 additions and 6 deletions.
  1. +11 −6 glscopeclient/main.cpp
17 changes: 11 additions & 6 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -62,27 +62,32 @@ void help()
" [general options]:\n"
" --help : this message...\n"
" --version : print version number. (not yet implemented)\n"
" --reconnect : ???\n"
" --nodata : ??\n"
" --retrigger : ??\n"
" --reconnect : when loading a .scopesession from the command line, reconnect to the instrument\n"
" (default is to do offline analysis)\n"
" --nodata : when loading a .scopesession from the command line, only load instrument/UI settings\n"
" (default is to load waveform data too)\n"
" --retrigger : when loading a .scopesession from the command line, start triggering immediately\n"
" (default is to be paused)\n"
"\n"
" [logger options]:\n"
" levels: ERROR, WARNING, NOTICE, VERBOSE, DEBUG\n"
" --quiet|-q : reduce logging level by one step\n"
" --verbose : set logging level to VERBOSE\n"
" --debug : set logging level to DEBUG\n"
" --trace <classname> : name of class with tracing messages. (Only relevant when logging level is DEBUG.)\n"
" --trace <classname>| : name of class with tracing messages. (Only relevant when logging level is DEBUG.)\n"
" <classname::function>\n"
" --logfile|-l <filename> : output log messages to file\n"
" --logfile-lines|-L <filename> : output log messages to file, with line buffering\n"
" --stdout-only : ??\n"
" --stdout-only : writes errors/warnings to stdout instead of stderr\n"
"\n"
" [filename|scope]:\n"
" filename : ??\n"
" filename : path to a .scopesession to load on startup\n"
" scope : <scope name>:<scope driver>:<transport protocol>[:<transport arguments]\n"
"\n"
" Examples:\n"
" glscopeclient --debug myscope:siglent:lxi:192.166.1.123\n"
" glscopeclient --debug --trace SCPITMCTransport myscope:siglent:usbtmc:/dev/usbtmc0\n"
" glscopeclient --reconnect --retrigger foobar.scopesession\n"
"\n"
);
}