From 0e96068df25f656653afe96145c35a2fdce4818f Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Wed, 3 Oct 2018 22:04:30 +0200 Subject: [PATCH] Rename --no-scan to --dont-scan --- doc/pulseview.1 | 2 +- main.cpp | 4 ++-- manual/cli.txt | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/pulseview.1 b/doc/pulseview.1 index 834247b..8289eaa 100644 --- a/doc/pulseview.1 +++ b/doc/pulseview.1 @@ -47,7 +47,7 @@ Specify the capture device to connect to. If the option is not supplied, PulseView attempts to re-connect to the most recently used device, or auto-detect available devices. .TP -.BR "\-D, \-\-no\-scan " +.BR "\-D, \-\-dont\-scan " Usually PulseView automatically scans all drivers to find suitable devices during program startup. This option disables the auto-scan. Users can either specify the diff --git a/main.cpp b/main.cpp index 8054e49..c7fe9bb 100644 --- a/main.cpp +++ b/main.cpp @@ -151,7 +151,7 @@ void usage() " -V, --version Show release version\n" " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n" " -d, --driver Specify the device driver to use\n" - " -D, --no-scan Don't auto-scan for devices, use -d spec only\n" + " -D, --dont-scan Don't auto-scan for devices, use -d spec only\n" " -i, --input-file Load input from file\n" " -I, --input-format Input format\n" " -c, --clean Don't restore previous sessions on startup\n" @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) {"version", no_argument, nullptr, 'V'}, {"loglevel", required_argument, nullptr, 'l'}, {"driver", required_argument, nullptr, 'd'}, - {"no-scan", no_argument, nullptr, 'D'}, + {"dont-scan", no_argument, nullptr, 'D'}, {"input-file", required_argument, nullptr, 'i'}, {"input-format", required_argument, nullptr, 'I'}, {"clean", no_argument, nullptr, 'c'}, diff --git a/manual/cli.txt b/manual/cli.txt index c7798df..001b6e9 100644 --- a/manual/cli.txt +++ b/manual/cli.txt @@ -21,22 +21,22 @@ a file on startup. Without -I, it is assumed that the file is in the native sigr You can also specify more than one file but they are all expected to be in the same format then. Example: - pulseview -i data.vcd -I vcd + pulseview -i data.csv -I csv:samplerate=3000000 The remaining parameters are mostly for debug purposes: -V / --version Shows the release version -l / --loglevel Sets the libsigrok/libsigrokdecode log level (max is 5) - -D / --no-scan Don't auto-scan + -D / --dont-scan Don't auto-scan for devices -c / --clean Don't restore previous sessions on startup -Of these, -D can be useful when PulseView gets stuck during the startup device scan. No such -scan will be performed then, allowing the program to start up but you'll have to scan for your -acquisition device(s) manually before you can use them then. +Of these, -D / --dont-scan can be useful when PulseView gets stuck during the startup device scan. +No such scan will be performed then, allowing the program to start up but you'll have to scan for +your acquisition device(s) manually before you can use them. -Another potentially useful option is -c, which can be used when PulseView doesn't start up and -you don't know what could cause this. +Another potentially useful option is -c / --clean, which can be used when PulseView doesn't start +up and you don't know what could cause this. Thus, the combination of both parameters can be seen as some kind of "safe mode" for PulseView: - pulseview -D -c + pulseview -c -D -- 2.30.2