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: 58fe5325c5d9
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: 0d4291f0c577
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 3, 2020

  1. Copy the full SHA
    a75305e View commit details
  2. Copy the full SHA
    31257ca View commit details
  3. Merge pull request #111 from tomverbeure/help_message

    Print help message with '--help' on command line.
    azonenberg authored Jun 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0d4291f View commit details
Showing with 36 additions and 1 deletion.
  1. +36 −1 glscopeclient/main.cpp
37 changes: 36 additions & 1 deletion glscopeclient/main.cpp
Original file line number Diff line number Diff line change
@@ -52,6 +52,41 @@ int g_numDecodes = 0;

ScopeApp* g_app = NULL;

void help();

void help()
{
fprintf(stderr,
"glscopeclient [general options] [logger options] [filename|scope]\n"
"\n"
" [general options]:\n"
" --help : this message...\n"
" --version : print version number. (not yet implemented)\n"
" --reconnect : ???\n"
" --nodata : ??\n"
" --retrigger : ??\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"
" --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"
"\n"
" [filename|scope]:\n"
" filename : ??\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"
"\n"
);
}

int main(int argc, char* argv[])
{
//Global settings
@@ -73,7 +108,7 @@ int main(int argc, char* argv[])

if(s == "--help")
{
//not implemented
help();
return 0;
}
else if(s == "--version")