sigrok-cli.git
6 years agoRe-add HACKING file after repo split.
Uwe Hermann [Tue, 16 Oct 2012 12:56:43 +0000 (14:56 +0200)]
Re-add HACKING file after repo split.

7 years agoMerge branch 'master' of ssh://sigrok.org/data/git/sigrok-cli
Bert Vermeulen [Sun, 14 Oct 2012 12:59:11 +0000 (14:59 +0200)]
Merge branch 'master' of ssh://sigrok.org/data/git/sigrok-cli

7 years agomore compact display of probe list
Bert Vermeulen [Sun, 14 Oct 2012 12:58:30 +0000 (14:58 +0200)]
more compact display of probe list

7 years agodon't accept numbers as probe indexes in probe string
Bert Vermeulen [Sun, 14 Oct 2012 12:53:30 +0000 (14:53 +0200)]
don't accept numbers as probe indexes in probe string

Unless the driver actually names them by number -- but the comparison
is done by string now.

Syntax for --probes is unchanged; even a range like 0-7 still works,
but only if there really are probes named "0", "1" etc.

7 years agoREADME: Cosmetics, update URL.
Uwe Hermann [Wed, 10 Oct 2012 21:48:11 +0000 (23:48 +0200)]
README: Cosmetics, update URL.

7 years agoupdated URLs and description
Bert Vermeulen [Mon, 8 Oct 2012 20:01:53 +0000 (22:01 +0200)]
updated URLs and description

7 years agorestore pre-split ignores
Bert Vermeulen [Mon, 8 Oct 2012 19:59:40 +0000 (21:59 +0200)]
restore pre-split ignores

7 years agodevice detail now lists probes
Bert Vermeulen [Mon, 8 Oct 2012 19:52:41 +0000 (21:52 +0200)]
device detail now lists probes

7 years agocli: support for new output module API
Bert Vermeulen [Sat, 8 Sep 2012 01:04:55 +0000 (03:04 +0200)]
cli: support for new output module API

7 years agocli: fix driver option conversion
Bert Vermeulen [Sun, 2 Sep 2012 13:40:51 +0000 (15:40 +0200)]
cli: fix driver option conversion

7 years agocli: use --show for PD detail
Bert Vermeulen [Mon, 6 Aug 2012 10:23:52 +0000 (12:23 +0200)]
cli: use --show for PD detail

7 years agocli: obsolete SR_HWCAP_PROBECONFIG
Bert Vermeulen [Sun, 5 Aug 2012 22:23:29 +0000 (00:23 +0200)]
cli: obsolete SR_HWCAP_PROBECONFIG

7 years agocli: use new sr_dev_config_set() API call
Bert Vermeulen [Sun, 5 Aug 2012 13:54:43 +0000 (15:54 +0200)]
cli: use new sr_dev_config_set() API call

7 years agocli: don't try to set device options before opening it
Bert Vermeulen [Sun, 5 Aug 2012 01:33:58 +0000 (03:33 +0200)]
cli: don't try to set device options before opening it

7 years agocli: use new API calls instead of static option data
Bert Vermeulen [Sun, 5 Aug 2012 01:31:45 +0000 (03:31 +0200)]
cli: use new API calls instead of static option data

7 years agocli: rename sr_hw_hwcap_get() to sr_devopt_get()
Bert Vermeulen [Sat, 4 Aug 2012 12:36:09 +0000 (14:36 +0200)]
cli: rename sr_hw_hwcap_get() to sr_devopt_get()

7 years agocli: use new generic arg parser API
Bert Vermeulen [Fri, 3 Aug 2012 09:48:41 +0000 (11:48 +0200)]
cli: use new generic arg parser API

7 years agocli: don't call sr_session_stop() when SR_DF_END is seen
Bert Vermeulen [Thu, 2 Aug 2012 23:05:59 +0000 (01:05 +0200)]
cli: don't call sr_session_stop() when SR_DF_END is seen

This was effectively an infinite loop in some cases.

7 years agocli: fix session saving
Bert Vermeulen [Mon, 23 Jul 2012 14:20:23 +0000 (16:20 +0200)]
cli: fix session saving

7 years agocli: code cleanup
Bert Vermeulen [Mon, 23 Jul 2012 01:06:47 +0000 (03:06 +0200)]
cli: code cleanup

7 years agocli: use probe numbers starting from 0
Bert Vermeulen [Mon, 23 Jul 2012 01:03:07 +0000 (03:03 +0200)]
cli: use probe numbers starting from 0

7 years agocli: change to new struct sr_dev_inst based libsigrok API
Bert Vermeulen [Sun, 22 Jul 2012 18:16:46 +0000 (20:16 +0200)]
cli: change to new struct sr_dev_inst based libsigrok API

7 years agocli: remove dead code
Bert Vermeulen [Sun, 22 Jul 2012 14:55:26 +0000 (16:55 +0200)]
cli: remove dead code

7 years agocli: add --show option, and switch to new info_get driver API
Bert Vermeulen [Mon, 16 Jul 2012 01:12:27 +0000 (03:12 +0200)]
cli: add --show option, and switch to new info_get driver API

7 years agocli: add --driver option, and switch to new sr API scanner
Bert Vermeulen [Mon, 16 Jul 2012 01:00:56 +0000 (03:00 +0200)]
cli: add --driver option, and switch to new sr API scanner

7 years agocli: more flexible generic arg parser
Bert Vermeulen [Sun, 15 Jul 2012 23:03:30 +0000 (01:03 +0200)]
cli: more flexible generic arg parser

7 years agoAllow setting samplerate when reading binary files
Tomaž Šolc [Wed, 4 Jul 2012 14:29:13 +0000 (16:29 +0200)]
Allow setting samplerate when reading binary files

I had a binary file that I needed to decode using UART decoder. UART
decoder needs to know the sample rate for the data, but currently it's
not possible to pass parameters to input formats and so the "binary"
file format always sets the samplerate to 0.

This patch adds the possibility to append a colon-separated list of
key=value options to the -I argument, in the same way -d supports it.
Also, it makes the "binary" format support the "samplerate" option.

I included the GHashTable containing input format options directly in
the sr_input struct. I'm not sure if that's the right way to do it. I
saw that -d uses a much more elaborate system with device capabilities
and typed options, but that seemed like an overkill for input formats.

7 years agocli: Use sr_session_stop() instead of sr_session_halt()
Lars-Peter Clausen [Thu, 5 Jul 2012 19:15:10 +0000 (21:15 +0200)]
cli: Use sr_session_stop() instead of sr_session_halt()

Use sr_session_stop() instead of the deprecated sr_session_halt().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
7 years agocli: switch to new <libsigrok/libsigrok.h>
Bert Vermeulen [Wed, 4 Jul 2012 23:06:28 +0000 (01:06 +0200)]
cli: switch to new <libsigrok/libsigrok.h>

7 years agocli: flush output on write
Bert Vermeulen [Tue, 26 Jun 2012 21:25:36 +0000 (23:25 +0200)]
cli: flush output on write

7 years agocli: Fix typo in protocol decoder stacking example
Lars-Peter Clausen [Sun, 24 Jun 2012 08:58:32 +0000 (10:58 +0200)]
cli: Fix typo in protocol decoder stacking example

Probe assignments are separated by colon and not by comma.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
7 years agosr/srd/cli: require glib version >= 2.28
Bert Vermeulen [Fri, 22 Jun 2012 23:17:36 +0000 (01:17 +0200)]
sr/srd/cli: require glib version >= 2.28

Needed for g_get_monotonic_time(). Thanks to Tomaž Šolc.

7 years agocli: Add missing fflush(stdout) for PD annotation output.
Uwe Hermann [Fri, 22 Jun 2012 15:47:11 +0000 (17:47 +0200)]
cli: Add missing fflush(stdout) for PD annotation output.

This is required/helpful to be able to pipe sigrok-cli PD output into
other tools, like this:

  sigrok-cli -i ... -a ... | othertool

7 years agocli: use output API for analog and frame begin/end packets
Bert Vermeulen [Tue, 19 Jun 2012 00:13:21 +0000 (02:13 +0200)]
cli: use output API for analog and frame begin/end packets

7 years agocli: not doing sigrokdecode directly from analog data
Bert Vermeulen [Tue, 19 Jun 2012 00:08:29 +0000 (02:08 +0200)]
cli: not doing sigrokdecode directly from analog data

It's just a completely different can of beans.

7 years agocli: output API says to check data_out, not length_out
Bert Vermeulen [Tue, 12 Jun 2012 22:48:43 +0000 (00:48 +0200)]
cli: output API says to check data_out, not length_out

7 years agocli/gtk/qt: Now all require libsigrok >= 0.2.0 (API changes).
Uwe Hermann [Thu, 31 May 2012 22:23:47 +0000 (00:23 +0200)]
cli/gtk/qt: Now all require libsigrok >= 0.2.0 (API changes).

7 years agocli: strip off PD arguments before selecting for annotation
Bert Vermeulen [Thu, 31 May 2012 21:57:16 +0000 (23:57 +0200)]
cli: strip off PD arguments before selecting for annotation

This fixes the bug where -A didn't work if the PD in question had arguments.

7 years agosr: Made hwcap const
Joel Holdsworth [Mon, 7 May 2012 12:57:43 +0000 (13:57 +0100)]
sr: Made hwcap const

7 years agocli: support for SR_HWCAP_COUPLING
Bert Vermeulen [Thu, 17 May 2012 01:17:28 +0000 (03:17 +0200)]
cli: support for SR_HWCAP_COUPLING

7 years agocli: support SR_HWCAP_VDIV and the new SR_T_RATIONAL_VOLT type
Bert Vermeulen [Thu, 17 May 2012 00:03:46 +0000 (02:03 +0200)]
cli: support SR_HWCAP_VDIV and the new SR_T_RATIONAL_VOLT type

7 years agocli: use SR_T_RATIONAL_PERIOD
Bert Vermeulen [Wed, 16 May 2012 00:08:20 +0000 (02:08 +0200)]
cli: use SR_T_RATIONAL_PERIOD

7 years agocli: support for SR_HWCAP_FILTER and SR_DI_FILTERS
Bert Vermeulen [Tue, 15 May 2012 20:40:23 +0000 (22:40 +0200)]
cli: support for SR_HWCAP_FILTER and SR_DI_FILTERS

7 years agocli: parameter support various new HWCAPs and types
Bert Vermeulen [Tue, 15 May 2012 18:54:10 +0000 (20:54 +0200)]
cli: parameter support various new HWCAPs and types

7 years agocli: support for frames, and limiting capture by number of frames.
Bert Vermeulen [Mon, 30 Apr 2012 17:58:21 +0000 (19:58 +0200)]
cli: support for frames, and limiting capture by number of frames.

7 years agocli: use SR_DF_META_*, support for analog packets
Bert Vermeulen [Sun, 22 Apr 2012 22:27:30 +0000 (00:27 +0200)]
cli: use SR_DF_META_*, support for analog packets

7 years agocli: configure.ac: Bump version number to 0.3.1. sigrok-cli-0.3.1
Uwe Hermann [Wed, 30 May 2012 20:43:50 +0000 (22:43 +0200)]
cli: configure.ac: Bump version number to 0.3.1.

7 years agocli: Constify a few char *pointers.
Uwe Hermann [Wed, 30 May 2012 20:15:29 +0000 (22:15 +0200)]
cli: Constify a few char *pointers.

7 years agocli: Update NEWS in preparation of 0.3.1 the release.
Uwe Hermann [Wed, 30 May 2012 19:57:44 +0000 (21:57 +0200)]
cli: Update NEWS in preparation of 0.3.1 the release.

7 years agocli: Cosmetic fix for --help output.
Uwe Hermann [Tue, 29 May 2012 22:18:59 +0000 (00:18 +0200)]
cli: Cosmetic fix for --help output.

7 years agocli: Fix compile error.
Uwe Hermann [Tue, 29 May 2012 20:35:38 +0000 (22:35 +0200)]
cli: Fix compile error.

7 years agocli: Make --protocol-decoder-annotations plural.
Uwe Hermann [Tue, 29 May 2012 18:55:22 +0000 (20:55 +0200)]
cli: Make --protocol-decoder-annotations plural.

This option supports (will support) multiple annotations from multiple
PDs, as well as multiple annotation formats per PD, so use plural.

7 years agocli: Add -A (alias for --protocol-decoder-annotation).
Uwe Hermann [Tue, 29 May 2012 18:48:54 +0000 (20:48 +0200)]
cli: Add -A (alias for --protocol-decoder-annotation).

7 years agocli: manpage cosmetics, updates.
Uwe Hermann [Tue, 29 May 2012 18:39:57 +0000 (20:39 +0200)]
cli: manpage cosmetics, updates.

7 years agosr/srd/cli/gtk: ChangeLog -> MAINTAINERCLEANFILES.
Uwe Hermann [Tue, 29 May 2012 18:30:15 +0000 (20:30 +0200)]
sr/srd/cli/gtk: ChangeLog -> MAINTAINERCLEANFILES.

If the (generated) ChangeLog file is marked for DISTCLEANFILES, it'll be
removed whenever "make distclean" is called (and is then gone forever if
you use the tarballs, for example).

7 years agocli: Output which file format was autodetected.
Uwe Hermann [Mon, 28 May 2012 22:23:33 +0000 (00:23 +0200)]
cli: Output which file format was autodetected.

7 years agodocument --protocol-decoder-annotation, and note PD stack is optional.
Bert Vermeulen [Tue, 29 May 2012 14:06:40 +0000 (16:06 +0200)]
document --protocol-decoder-annotation, and note PD stack is optional.

7 years agocli: factor out output format setup
Bert Vermeulen [Tue, 29 May 2012 13:44:17 +0000 (15:44 +0200)]
cli: factor out output format setup

main() is now clean.

7 years agocli: option to specify which annotation(s) to show
Bert Vermeulen [Tue, 29 May 2012 12:50:02 +0000 (14:50 +0200)]
cli: option to specify which annotation(s) to show

Also factor out PD stack setup, and remove redundant error messages.

7 years agocli: stop immediately if SRD PD registration fails
Bert Vermeulen [Tue, 29 May 2012 10:38:36 +0000 (12:38 +0200)]
cli: stop immediately if SRD PD registration fails

7 years agocli: loose string comparison helper
Bert Vermeulen [Tue, 29 May 2012 10:12:51 +0000 (12:12 +0200)]
cli: loose string comparison helper

7 years agocli: always show G_LOG_LEVEL_CRITICAL messages
Bert Vermeulen [Tue, 29 May 2012 09:36:31 +0000 (11:36 +0200)]
cli: always show G_LOG_LEVEL_CRITICAL messages

7 years agocli: cosmetics
Bert Vermeulen [Mon, 28 May 2012 14:57:33 +0000 (16:57 +0200)]
cli: cosmetics

7 years agocli: halt session if SRD session fails to initialize
Bert Vermeulen [Sun, 27 May 2012 17:30:30 +0000 (19:30 +0200)]
cli: halt session if SRD session fails to initialize

7 years agocli: only output module or PD goes to stdout, everything else to stderr
Bert Vermeulen [Sat, 26 May 2012 02:54:34 +0000 (04:54 +0200)]
cli: only output module or PD goes to stdout, everything else to stderr

7 years agocli: removed obsolete debugging, setup for proper stderr logging
Bert Vermeulen [Tue, 22 May 2012 23:35:23 +0000 (01:35 +0200)]
cli: removed obsolete debugging, setup for proper stderr logging

7 years agocli: no need to specify stacking order if it's the same as the PD list
Bert Vermeulen [Tue, 22 May 2012 18:16:56 +0000 (20:16 +0200)]
cli: no need to specify stacking order if it's the same as the PD list

7 years agosr/srd/cli: Fix compiling with Homebrew.
Pekka Nikander [Fri, 11 May 2012 16:23:21 +0000 (19:23 +0300)]
sr/srd/cli: Fix compiling with Homebrew.

Add ACLOCAL_DIR setting and AM_PROG_AR macro for compiling with Homebrew
under Mac OS X.

Applies essentially the same change to
{libsigrok,libsigrokdecode,sigrok-cli}/{autogen.sh,configure.ac}

It may be that the same fix is needed for the other autogen.sh and/or
configure.ac files, but that hasn't been tested and therefore not in
this commit.

7 years agocli: Print required/optional probes info.
Uwe Hermann [Wed, 9 May 2012 16:59:17 +0000 (18:59 +0200)]
cli: Print required/optional probes info.

When running 'sigrok-cli -a uart' (for example), we now additionally
print which required/optional probes the decoder needs.

7 years agocli: -V: Print protocol description upon "-l 3" or higher.
Uwe Hermann [Tue, 8 May 2012 22:06:01 +0000 (00:06 +0200)]
cli: -V: Print protocol description upon "-l 3" or higher.

7 years agoFix bracket placing
Thomas Jarosch [Fri, 4 May 2012 08:18:22 +0000 (10:18 +0200)]
Fix bracket placing

Make it consistent with the rest of the code

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
7 years agocli: Generate ChangeLog upon 'make dist'.
Uwe Hermann [Tue, 17 Apr 2012 22:02:54 +0000 (00:02 +0200)]
cli: Generate ChangeLog upon 'make dist'.

7 years agocli: New 0.3.0 release. sigrok-cli-0.3.0
Uwe Hermann [Mon, 16 Apr 2012 22:11:25 +0000 (00:11 +0200)]
cli: New 0.3.0 release.

Document the major user-visible changes in the NEWS file.

7 years agocli: Show sr/srd versions determined at run-time.
Uwe Hermann [Mon, 16 Apr 2012 19:49:05 +0000 (21:49 +0200)]
cli: Show sr/srd versions determined at run-time.

7 years agocli: NEWS: Add 0.1.0/0.2.0 release docs.
Uwe Hermann [Sat, 14 Apr 2012 16:50:22 +0000 (18:50 +0200)]
cli: NEWS: Add 0.1.0/0.2.0 release docs.

7 years agocli: Add (almost) empty NEWS file.
Uwe Hermann [Sat, 7 Apr 2012 16:15:34 +0000 (18:15 +0200)]
cli: Add (almost) empty NEWS file.

7 years agosr/srd: Use/fix SR(D)_MAX_NUM_PROBES.
Uwe Hermann [Sat, 7 Apr 2012 16:14:39 +0000 (18:14 +0200)]
sr/srd: Use/fix SR(D)_MAX_NUM_PROBES.

7 years agosr: out: Use uint8_t (not char) for buffers.
Uwe Hermann [Wed, 28 Mar 2012 18:00:13 +0000 (20:00 +0200)]
sr: out: Use uint8_t (not char) for buffers.

7 years agosrd/cli/qt: Some more API consistency renames.
Uwe Hermann [Sun, 25 Mar 2012 12:49:11 +0000 (14:49 +0200)]
srd/cli/qt: Some more API consistency renames.

7 years agocli: Fix -V/-h output a bit.
Uwe Hermann [Wed, 21 Mar 2012 18:58:56 +0000 (19:58 +0100)]
cli: Fix -V/-h output a bit.

Options and their defaults should not be documented there, but rather in
the manpage or such.

7 years agosr/cli/gtk/qt: Fix package version numbers / docs.
Uwe Hermann [Wed, 21 Mar 2012 17:40:25 +0000 (18:40 +0100)]
sr/cli/gtk/qt: Fix package version numbers / docs.

The next (and first) libsigrok release will be called 0.1.0.

The next (and first) libsigrokdecode release will be called 0.1.0.

The next sigrok-cli release will be called 0.3.0 (as we already had a 0.1
and 0.2 release of sigrok-cli; those did not yet use the libs, though).

sigrok-gtk and sigrok-qt didn't have any releases yet, so their version
numbers are set to 0.1.0.

Also, consistently use three numbers/digits for our version numbers.

7 years agosr/cli: s/patternmode/pattern/ in a few places.
Uwe Hermann [Tue, 20 Mar 2012 17:09:18 +0000 (18:09 +0100)]
sr/cli: s/patternmode/pattern/ in a few places.

7 years agosrd/cli/qt: s/srd_session_feed/srd_session_send/.
Uwe Hermann [Tue, 20 Mar 2012 16:58:25 +0000 (17:58 +0100)]
srd/cli/qt: s/srd_session_feed/srd_session_send/.

7 years agocli: Same order for params in manpage and -h.
Uwe Hermann [Sun, 18 Mar 2012 19:30:42 +0000 (20:30 +0100)]
cli: Same order for params in manpage and -h.

7 years agocli: manpage: Document -l, -a, and -s.
Uwe Hermann [Sun, 18 Mar 2012 19:24:31 +0000 (20:24 +0100)]
cli: manpage: Document -l, -a, and -s.

Also, update list of supporter input/output formats.

7 years agocli: Fix/update manpage a bit.
Uwe Hermann [Sun, 18 Mar 2012 13:55:14 +0000 (14:55 +0100)]
cli: Fix/update manpage a bit.

7 years agosrd/cli/qt:s/decoders/decoder/ for consistency.
Uwe Hermann [Fri, 16 Mar 2012 14:25:53 +0000 (15:25 +0100)]
srd/cli/qt:s/decoders/decoder/ for consistency.

7 years agosr: Rename -f|--format to -O|--output-format.
Uwe Hermann [Sun, 18 Mar 2012 13:33:02 +0000 (14:33 +0100)]
sr: Rename -f|--format to -O|--output-format.

This is done for consistency with the -I|--input-format option. We now have:

-i|--input-file
-o|--output-file
-I|--input-format
-O|--output-format

7 years agosr: Name all callback data 'cb_data'.
Uwe Hermann [Wed, 29 Feb 2012 21:32:34 +0000 (22:32 +0100)]
sr: Name all callback data 'cb_data'.

7 years agosr/cli/gtk/qt: s/hw/driver/ in some places.
Uwe Hermann [Wed, 29 Feb 2012 18:56:15 +0000 (19:56 +0100)]
sr/cli/gtk/qt: s/hw/driver/ in some places.

7 years agosr: s/sr_dev_probe_name/sr_dev_probe_name_set/.
Uwe Hermann [Wed, 29 Feb 2012 18:17:36 +0000 (19:17 +0100)]
sr: s/sr_dev_probe_name/sr_dev_probe_name_set/.

7 years agosr/cli/gtk/qt/: s/plugin/driver/.
Uwe Hermann [Tue, 28 Feb 2012 22:52:30 +0000 (23:52 +0100)]
sr/cli/gtk/qt/: s/plugin/driver/.

7 years agosr: sr_samplerate_string: Allow 3.15Hz etc. as output.
Uwe Hermann [Mon, 27 Feb 2012 21:27:33 +0000 (22:27 +0100)]
sr: sr_samplerate_string: Allow 3.15Hz etc. as output.

This is required for some hardware, e.g. ChronoVu LA8, where
33.333333 MHz or 2.439024 MHz are valid samplerates. This is because the
hardware takes a sampleperiod (in nanoseconds) as input, not a
samplerate (in Hz).

7 years agosr: No need for dynamic hardware driver registration.
Uwe Hermann [Wed, 22 Feb 2012 20:48:30 +0000 (21:48 +0100)]
sr: No need for dynamic hardware driver registration.

We don't need or allow run-time registration of hardware
drivers/plugins, they're added at compile-time.

7 years agocli/gtk/qt: nsis: Better installer filename.
Uwe Hermann [Wed, 22 Feb 2012 18:16:03 +0000 (19:16 +0100)]
cli/gtk/qt: nsis: Better installer filename.

7 years agocli: nsis: Hook up to "Add/remove programs".
Uwe Hermann [Wed, 22 Feb 2012 17:57:34 +0000 (18:57 +0100)]
cli: nsis: Hook up to "Add/remove programs".

7 years agosr: s/config_set/dev_config_set/.
Uwe Hermann [Sat, 18 Feb 2012 11:11:15 +0000 (12:11 +0100)]
sr: s/config_set/dev_config_set/.

This functions is per-device-instance, so use dev_ as prefix as with
the other ones.

7 years agosr/cli/gtk/qt: s/configuration/config/.
Uwe Hermann [Fri, 17 Feb 2012 23:31:35 +0000 (00:31 +0100)]
sr/cli/gtk/qt: s/configuration/config/.

7 years agosr/cli/gtk: s/capability/hwcap/.
Uwe Hermann [Fri, 17 Feb 2012 23:17:18 +0000 (00:17 +0100)]
sr/cli/gtk: s/capability/hwcap/.

7 years agosr/cli/gtk: A few more s/instance/inst/.
Uwe Hermann [Fri, 17 Feb 2012 22:55:27 +0000 (23:55 +0100)]
sr/cli/gtk: A few more s/instance/inst/.