]> sigrok.org Git - libsigrok.git/log
libsigrok.git
13 years agoInitial support for the OLS output format.
Uwe Hermann [Sat, 15 Jan 2011 17:18:09 +0000 (18:18 +0100)]
Initial support for the OLS output format.

This is the file format for the OpenBench Logic Sniffer "Alternative" client.
Details: https://github.com/jawi/ols/wiki/OLS-data-file-format

This is work-in-progress.
Currently the number of samples is hardcoded to 10000. Also, this will
require a real logic analyzer as input at the moment, and will not yet
work with the "demo" driver.

13 years agooutput_text: Allocate more memory for output
Håvard Espeland [Sat, 15 Jan 2011 17:24:01 +0000 (18:24 +0100)]
output_text: Allocate more memory for output

The trigger line was forgotten. Allocate 512 bytes extra.

13 years agoSigma: Move sigma state to device specific struct
Håvard Espeland [Sat, 15 Jan 2011 16:02:18 +0000 (17:02 +0100)]
Sigma: Move sigma state to device specific struct

Thanks to Daniel Ribeiro for contributing this patch. Some
modifications were done.

Not tested on multiple Sigmas, because of lack of hardware.

13 years agooutput_text: Allocate enough memory for output
Håvard Espeland [Sat, 15 Jan 2011 15:10:57 +0000 (16:10 +0100)]
output_text: Allocate enough memory for output

13 years agoDrop unused debug.c.
Uwe Hermann [Sat, 15 Jan 2011 14:44:21 +0000 (15:44 +0100)]
Drop unused debug.c.

Even if we'd use it, it probably belongs into the frontend, not libsigrok.

13 years agoCosmetics.
Uwe Hermann [Sat, 15 Jan 2011 14:43:25 +0000 (15:43 +0100)]
Cosmetics.

13 years agosigrok-proto.h: Sort the prototypes, fix comments.
Uwe Hermann [Sat, 15 Jan 2011 14:43:03 +0000 (15:43 +0100)]
sigrok-proto.h: Sort the prototypes, fix comments.

13 years agoStart moving private stuff to sigrok-internal.h.
Uwe Hermann [Sat, 15 Jan 2011 14:06:58 +0000 (15:06 +0100)]
Start moving private stuff to sigrok-internal.h.

This is work-in-progress, unfinished.

13 years agofix hex output
Bert Vermeulen [Sat, 15 Jan 2011 14:21:54 +0000 (15:21 +0100)]
fix hex output

13 years agoSlightly more consistent #include-guard naming.
Uwe Hermann [Sat, 15 Jan 2011 13:41:57 +0000 (14:41 +0100)]
Slightly more consistent #include-guard naming.

13 years agoadded example code for generating a stored pattern
Bert Vermeulen [Sat, 15 Jan 2011 13:28:03 +0000 (14:28 +0100)]
added example code for generating a stored pattern

13 years agoSigma: Check state in hw_closedev
Håvard Espeland [Sat, 15 Jan 2011 13:03:08 +0000 (14:03 +0100)]
Sigma: Check state in hw_closedev

If the device is closed without previously running hw_openedev
the driver crashes (happens in cleanup). This patch checks
if the device has been opened.

13 years agodemo: Cosmetics, constify.
Uwe Hermann [Sat, 15 Jan 2011 12:06:04 +0000 (13:06 +0100)]
demo: Cosmetics, constify.

13 years agocleaned up demo driver
Bert Vermeulen [Sat, 15 Jan 2011 04:12:41 +0000 (05:12 +0100)]
cleaned up demo driver

removed unused samplerate
added patternmode (random and incremental)

13 years agoadd new HWCAP patternmode
Bert Vermeulen [Sat, 15 Jan 2011 04:11:40 +0000 (05:11 +0100)]
add new HWCAP patternmode

13 years agoCosmetics for the -D output.
Uwe Hermann [Sat, 15 Jan 2011 02:44:19 +0000 (03:44 +0100)]
Cosmetics for the -D output.

13 years agoWhitespace and consistency fixes.
Uwe Hermann [Thu, 13 Jan 2011 22:50:34 +0000 (23:50 +0100)]
Whitespace and consistency fixes.

Also, drop a <poll.h> #include. It's unused anyway, and breaks the build
on MinGW/Windows as there is no poll.h there.

13 years agomake output modules a bit more crashproof
Bert Vermeulen [Thu, 13 Jan 2011 01:05:39 +0000 (02:05 +0100)]
make output modules a bit more crashproof

the event handler in output modules is now optional.

13 years agouse us instead of µs in periods (VCD can't handle it)
Bert Vermeulen [Thu, 13 Jan 2011 00:26:23 +0000 (01:26 +0100)]
use us instead of µs in periods (VCD can't handle it)

13 years agoMinGW/Windows: Serial port portability fixes.
Uwe Hermann [Tue, 11 Jan 2011 23:43:00 +0000 (00:43 +0100)]
MinGW/Windows: Serial port portability fixes.

Add serial_read()/serial_write() which have different implementations on
MinGW/Windows.

Add some more error code handling and documentation.

13 years agoadd ontinuous mode for demo driver
Olivier Fauchon [Tue, 11 Jan 2011 23:25:15 +0000 (00:25 +0100)]
add ontinuous mode for demo driver

13 years agofully implement input_binary module
Bert Vermeulen [Tue, 11 Jan 2011 22:58:41 +0000 (23:58 +0100)]
fully implement input_binary module

13 years agocode cleanup
Bert Vermeulen [Tue, 11 Jan 2011 22:49:32 +0000 (23:49 +0100)]
code cleanup

13 years agoconfigure: Add --enable-demo option.
Uwe Hermann [Tue, 11 Jan 2011 21:17:33 +0000 (22:17 +0100)]
configure: Add --enable-demo option.

13 years agoMinGW: Quickfix to make serial.c/ols.c compile.
Uwe Hermann [Tue, 11 Jan 2011 00:25:10 +0000 (01:25 +0100)]
MinGW: Quickfix to make serial.c/ols.c compile.

Note: It does NOT actually work, yet, it only compiles!

13 years agocli: support --continuous option for continuous sampling
Bert Vermeulen [Mon, 10 Jan 2011 21:17:52 +0000 (22:17 +0100)]
cli: support --continuous option for continuous sampling

13 years agoCosmetics, whitespace, consistency fixes.
Uwe Hermann [Mon, 10 Jan 2011 22:20:37 +0000 (23:20 +0100)]
Cosmetics, whitespace, consistency fixes.

13 years agodemo: Add missing copyright line.
Uwe Hermann [Mon, 10 Jan 2011 21:49:38 +0000 (22:49 +0100)]
demo: Add missing copyright line.

13 years agoMerge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
Daniel Ribeiro [Mon, 10 Jan 2011 17:58:05 +0000 (15:58 -0200)]
Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok

13 years agoAdd incomplete mso-19 plugin
Daniel Ribeiro [Mon, 10 Jan 2011 17:15:51 +0000 (15:15 -0200)]
Add incomplete mso-19 plugin

* Both Analog and Logic capture works.
* Analog values are raw ADC, still useless.
* Triggers aren't implemented.
* Pattern Generator not implemented.
* Everything is broken. :)

13 years agoAdd HZ_TO_NS macro
Daniel Ribeiro [Mon, 10 Jan 2011 17:14:26 +0000 (15:14 -0200)]
Add HZ_TO_NS macro

13 years agoupdate plugins and cli to use new DF_HEADER
Daniel Ribeiro [Mon, 10 Jan 2011 17:12:38 +0000 (15:12 -0200)]
update plugins and cli to use new DF_HEADER

13 years agoSupport for analog probes
Daniel Ribeiro [Mon, 10 Jan 2011 17:08:43 +0000 (15:08 -0200)]
Support for analog probes

Add a field to the probe struct to store the probe type.
Change DF_HEADER to report the quantity of each type of probe.

13 years agoserial.c: fix parity != none
Daniel Ribeiro [Mon, 10 Jan 2011 17:05:14 +0000 (15:05 -0200)]
serial.c: fix parity != none

The flag write was wrong

13 years agofinish split of sigrok.h
Bert Vermeulen [Mon, 10 Jan 2011 12:47:24 +0000 (13:47 +0100)]
finish split of sigrok.h

13 years agosplit off prototypes into their own header file
Bert Vermeulen [Mon, 10 Jan 2011 12:44:11 +0000 (13:44 +0100)]
split off prototypes into their own header file

13 years agocli: new option to list output modules
Bert Vermeulen [Mon, 10 Jan 2011 11:39:53 +0000 (12:39 +0100)]
cli: new option to list output modules

13 years agoMerge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
Daniel Ribeiro [Mon, 10 Jan 2011 04:36:50 +0000 (02:36 -0200)]
Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok

13 years agoFinish serial_set_params implementation
Daniel Ribeiro [Mon, 10 Jan 2011 04:21:07 +0000 (02:21 -0200)]
Finish serial_set_params implementation

Adds the most common baud rates and support bits, parity, stopbits
and flocontrol settings.

13 years agoMerge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
Daniel Ribeiro [Mon, 10 Jan 2011 04:28:59 +0000 (02:28 -0200)]
Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok

13 years agooutput_analog: allow samples per line arg (default analog10)
Bert Vermeulen [Mon, 10 Jan 2011 04:27:22 +0000 (05:27 +0100)]
output_analog: allow samples per line arg (default analog10)

13 years agoFinish serial_set_params implementation
Daniel Ribeiro [Mon, 10 Jan 2011 04:21:07 +0000 (02:21 -0200)]
Finish serial_set_params implementation

Adds the most common baud rates and support bits, parity, stopbits
and flocontrol settings.

13 years agoadd DF_ANALOG, and an analog output module
Bert Vermeulen [Mon, 10 Jan 2011 04:13:46 +0000 (05:13 +0100)]
add DF_ANALOG, and an analog output module

Samples in DF_ANALOG packets are fixed in length to sizeof(double).

13 years agooutput modules now register the DF type they can use
Bert Vermeulen [Sun, 9 Jan 2011 22:22:48 +0000 (23:22 +0100)]
output modules now register the DF type they can use

13 years agoAdd a per-instance pointer storage for hardware plugins.
Daniel Ribeiro [Sun, 9 Jan 2011 05:50:45 +0000 (03:50 -0200)]
Add a per-instance pointer storage for hardware plugins.

We need this to properly support more than one device connected
at the same time.

13 years agoAdd ARRAY_AND_SIZE macro
Daniel Ribeiro [Sun, 9 Jan 2011 05:48:39 +0000 (03:48 -0200)]
Add ARRAY_AND_SIZE macro

Just a handy macro

13 years agochange all DF_LOGIC* to a single DF_LOGIC type
Bert Vermeulen [Sun, 9 Jan 2011 05:32:38 +0000 (06:32 +0100)]
change all DF_LOGIC* to a single DF_LOGIC type

The datafeed packet has a new field 'unitsize' to denote the number of
bytes per sample in the payload.

13 years agoOnly build specific source files if needed.
Uwe Hermann [Sat, 8 Jan 2011 19:06:32 +0000 (20:06 +0100)]
Only build specific source files if needed.

13 years agoOnly build hardware drivers if they're enabled.
Uwe Hermann [Sat, 8 Jan 2011 18:15:39 +0000 (19:15 +0100)]
Only build hardware drivers if they're enabled.

13 years agodemo driver: Small cleanups, error handling.
Uwe Hermann [Sat, 8 Jan 2011 18:01:07 +0000 (19:01 +0100)]
demo driver: Small cleanups, error handling.

13 years agoMake the demo driver work.
Uwe Hermann [Sat, 8 Jan 2011 17:29:10 +0000 (18:29 +0100)]
Make the demo driver work.

When initialized, the driver starts a thread that generates signal data.
This data is written to a pipe (write file descriptor).
The other end of the pipe (read file descriptor), is connected to the
main polling code, like any other driver.

Note: This patch adds a new dependency on libgthread.

At the moment, you can list the driver's device:

$ ./cli/sigrok-cli -D
The following devices were found:
ID  Device
0   Sigrok project Demo Driver v1.0 with 8 probes

And use it for random signal generation:

$ /opt/sigrok/bin/sigrok-cli -d 0 --samples 50 -f bits -p 1-8
sigrok 0.1pre2
Acquisition with 8/8 probes at 0 Hz
1:10111100 11010110 00001011 00011110 00111010 11110100 10
2:11010110 00111111 01001010 11111101 11010011 00010010 11
3:11000101 01000001 10100011 10100100 10110000 11110011 00
4:00100111 11110100 10011101 01100111 00100101 01001110 10
5:00011100 00101100 10111000 11001101 01011101 01011011 01
6:10110101 10111110 10010110 10111000 11011010 10000100 11
7:11111111 01001111 11110110 11010010 10000101 01001111 00
8:01000101 01111110 01010111 00000111 00010010 00000101 11

The next step is to make demo driver customisable (per-probe signal clock,
reference sample signals : serial, I2C, CAN...).

Thanks Olivier Fauchon <redacted> for the patch.

13 years agofix buffer size, various error checks
Bert Vermeulen [Sat, 8 Jan 2011 14:48:39 +0000 (15:48 +0100)]
fix buffer size, various error checks

13 years agoadd sigrok_period_string(), MAX_NUM_PROBES
Bert Vermeulen [Wed, 5 Jan 2011 23:51:29 +0000 (00:51 +0100)]
add sigrok_period_string(), MAX_NUM_PROBES

13 years agoFix two more compiler warnings noticed on amd64.
Uwe Hermann [Sat, 8 Jan 2011 02:51:31 +0000 (03:51 +0100)]
Fix two more compiler warnings noticed on amd64.

13 years agoFix out-of-tree build.
Uwe Hermann [Sat, 8 Jan 2011 02:32:25 +0000 (03:32 +0100)]
Fix out-of-tree build.

Use libtool "noinst" local helper libs and use one Makefile.am per
subdir, which is the usual/preferred method. These helper libraries are
purely local and will not be installed.

This also fixes out-of-tree builds of sigrok, i.e. building in a
directory other than the sigrok source directory, e.g.

 $ cd /home/user
 $ git clone ...sigrok
 $ cd sigrok
 $ ./autogen.sh
 $ mkdir /tmp/foo
 $ cd /tmp/foo
 $ /home/user/sigrok/configure
 $ make
 $ make install

This will place all build results (.o files, .la files, etc) in the
local build directory (/tmp/foo) instead of the source directory
(/home/user/sigrok in this example). The installation directory is
selected via the --prefix configure option (/usr/local per default).

13 years agoCosmetics, whitespace, simplifications.
Uwe Hermann [Fri, 7 Jan 2011 18:55:25 +0000 (19:55 +0100)]
Cosmetics, whitespace, simplifications.

Reduce code nesting a bit, constify some strings.

13 years agoInitial, unfinished demo/simulation hardware driver.
Uwe Hermann [Thu, 6 Jan 2011 18:16:47 +0000 (19:16 +0100)]
Initial, unfinished demo/simulation hardware driver.

13 years agoproper fix for output_text corner cases
Bert Vermeulen [Wed, 29 Dec 2010 00:22:58 +0000 (01:22 +0100)]
proper fix for output_text corner cases
limit probe names to 32 chars

13 years agoconsistent debug msgs, rename sump to ols
Bert Vermeulen [Tue, 28 Dec 2010 23:02:30 +0000 (00:02 +0100)]
consistent debug msgs, rename sump to ols

13 years agofix corner cases/memory management (cli->text out)
Bert Vermeulen [Tue, 28 Dec 2010 20:59:07 +0000 (21:59 +0100)]
fix corner cases/memory management (cli->text out)

13 years agodon't turn on/off libusb debugging
Bert Vermeulen [Mon, 27 Dec 2010 22:44:50 +0000 (23:44 +0100)]
don't turn on/off libusb debugging

14 years agooops, fix serial_flush()
Bert Vermeulen [Thu, 12 Aug 2010 04:04:44 +0000 (06:04 +0200)]
oops, fix serial_flush()

14 years agoadd serial_flush()
Bert Vermeulen [Thu, 12 Aug 2010 04:02:25 +0000 (06:02 +0200)]
add serial_flush()

14 years agoincrease length of datafeed packets to uint64_t
Bert Vermeulen [Thu, 12 Aug 2010 03:49:00 +0000 (05:49 +0200)]
increase length of datafeed packets to uint64_t

14 years agodon't push configuration to device until acq time
Bert Vermeulen [Thu, 12 Aug 2010 02:57:09 +0000 (04:57 +0200)]
don't push configuration to device until acq time

14 years agoOLS: fix multi-channel capture
Bert Vermeulen [Wed, 11 Aug 2010 16:37:09 +0000 (18:37 +0200)]
OLS: fix multi-channel capture

14 years agoadd debug logging (set SIGROK_DEBUG=2 to see)
Bert Vermeulen [Wed, 11 Aug 2010 02:04:20 +0000 (04:04 +0200)]
add debug logging (set SIGROK_DEBUG=2 to see)

14 years agoOLS: fix triggers, sample order, capture ratio
Bert Vermeulen [Thu, 5 Aug 2010 01:54:33 +0000 (03:54 +0200)]
OLS: fix triggers, sample order, capture ratio

14 years agodefine pre/post-trigger capture ratio option
Bert Vermeulen [Thu, 5 Aug 2010 01:52:32 +0000 (03:52 +0200)]
define pre/post-trigger capture ratio option

14 years agosaleae logic: fix triggers after style changes
Bert Vermeulen [Sun, 18 Jul 2010 19:57:27 +0000 (21:57 +0200)]
saleae logic: fix triggers after style changes

14 years agohwplugin.c: Add missing config.h #include.
Uwe Hermann [Wed, 14 Jul 2010 20:09:21 +0000 (22:09 +0200)]
hwplugin.c: Add missing config.h #include.

This fixes a bug where no LA would be found or displayed in lists such
as 'sigrok-cli -H' or 'sigrok-cli -D'.

Thanks Forrest Voight for spotting the bug.

14 years agoOnly build hardware plugins if requested by user.
Uwe Hermann [Thu, 24 Jun 2010 23:11:11 +0000 (01:11 +0200)]
Only build hardware plugins if requested by user.

Per default all plugins will be built, though. The user can override
this via the --disable-la-xxxx options.

14 years agoAdd per-LA --enable-XXXX configure options.
Uwe Hermann [Mon, 31 May 2010 09:34:10 +0000 (11:34 +0200)]
Add per-LA --enable-XXXX configure options.

14 years agoUse 'kHz' (not 'KHz') consistently.
Uwe Hermann [Wed, 26 May 2010 23:51:55 +0000 (01:51 +0200)]
Use 'kHz' (not 'KHz') consistently.

14 years agoSimplifications and small fixes.
Uwe Hermann [Tue, 18 May 2010 22:38:14 +0000 (00:38 +0200)]
Simplifications and small fixes.

14 years agoskeleton.c: Update to latest prototypes.
Uwe Hermann [Tue, 18 May 2010 22:23:27 +0000 (00:23 +0200)]
skeleton.c: Update to latest prototypes.

14 years agouse flexible sample limit specification (k/m/g)
Bert Vermeulen [Sat, 15 May 2010 21:30:17 +0000 (23:30 +0200)]
use flexible sample limit specification (k/m/g)

HWCAP_LIMIT_SAMPLES is now passed to the driver as *uint64

14 years agoCosmetics: Reduce nesting level a bit.
Uwe Hermann [Mon, 17 May 2010 21:59:56 +0000 (23:59 +0200)]
Cosmetics: Reduce nesting level a bit.

14 years agoFactor out opendev2/opendev3.
Uwe Hermann [Fri, 14 May 2010 12:24:05 +0000 (14:24 +0200)]
Factor out opendev2/opendev3.

14 years agoopendev2/opendev3: Don't depend on global vars.
Uwe Hermann [Fri, 14 May 2010 11:12:06 +0000 (13:12 +0200)]
opendev2/opendev3: Don't depend on global vars.

14 years agoCosmetics.
Uwe Hermann [Fri, 14 May 2010 11:07:03 +0000 (13:07 +0200)]
Cosmetics.

14 years agopkg-config: Add (semi-generated) libsigrok.pc.
Uwe Hermann [Tue, 11 May 2010 16:07:54 +0000 (18:07 +0200)]
pkg-config: Add (semi-generated) libsigrok.pc.

14 years agoDrop unused and obsolete gmodule stuff.
Uwe Hermann [Tue, 11 May 2010 15:13:35 +0000 (17:13 +0200)]
Drop unused and obsolete gmodule stuff.

14 years agosump/ols: Wait 10ms for hw response to make pl2303 reliable
Peter Stuge [Sun, 9 May 2010 21:11:08 +0000 (23:11 +0200)]
sump/ols: Wait 10ms for hw response to make pl2303 reliable

14 years agoserial: Remove unneccesary nesting
Peter Stuge [Sun, 9 May 2010 21:04:24 +0000 (23:04 +0200)]
serial: Remove unneccesary nesting

14 years agoVCD: Optimizations and fixes.
Uwe Hermann [Sun, 9 May 2010 19:05:15 +0000 (21:05 +0200)]
VCD: Optimizations and fixes.

14 years agoVCD/Gnuplot: Fix incorrect sample counter.
Uwe Hermann [Sun, 9 May 2010 18:52:36 +0000 (20:52 +0200)]
VCD/Gnuplot: Fix incorrect sample counter.

14 years agoGnuplot: Nicer output formatting.
Uwe Hermann [Sun, 9 May 2010 18:27:11 +0000 (20:27 +0200)]
Gnuplot: Nicer output formatting.

14 years agofilter.c: Error handling, code simplification.
Uwe Hermann [Sun, 9 May 2010 17:36:43 +0000 (19:36 +0200)]
filter.c: Error handling, code simplification.

14 years agoGnuplot: Improve column/probe name display.
Uwe Hermann [Sun, 9 May 2010 13:52:56 +0000 (15:52 +0200)]
Gnuplot: Improve column/probe name display.

This fixes incorrect probe name display if the user explicitly named
probes via '-p 1=CLK' etc.

14 years agooutput_text: More error handling.
Uwe Hermann [Sun, 9 May 2010 13:38:33 +0000 (15:38 +0200)]
output_text: More error handling.

14 years agooutput_gnuplot: Simplify event().
Uwe Hermann [Sun, 9 May 2010 13:12:10 +0000 (15:12 +0200)]
output_gnuplot: Simplify event().

14 years agooutput_binary: Code simplifications.
Uwe Hermann [Sun, 9 May 2010 13:11:47 +0000 (15:11 +0200)]
output_binary: Code simplifications.

14 years agoGnuplot quickfix: Increase malloc()'ed size.
Uwe Hermann [Sun, 9 May 2010 13:02:17 +0000 (15:02 +0200)]
Gnuplot quickfix: Increase malloc()'ed size.

14 years agoVCD/Gnuplot: Store time/date in output.
Uwe Hermann [Sun, 9 May 2010 12:54:16 +0000 (14:54 +0200)]
VCD/Gnuplot: Store time/date in output.

14 years agoVCD/Gnuplot: Cosmetics, code simplifications.
Uwe Hermann [Sun, 9 May 2010 12:42:46 +0000 (14:42 +0200)]
VCD/Gnuplot: Cosmetics, code simplifications.

14 years agoGnuplot output: More error handling.
Uwe Hermann [Sun, 9 May 2010 12:35:02 +0000 (14:35 +0200)]
Gnuplot output: More error handling.

14 years agodatastore_new(): Use int as return value.
Uwe Hermann [Sun, 9 May 2010 11:32:58 +0000 (13:32 +0200)]
datastore_new(): Use int as return value.

14 years agoDatastore: More error checking.
Uwe Hermann [Sun, 9 May 2010 11:25:03 +0000 (13:25 +0200)]
Datastore: More error checking.

14 years agoVCD: Improve error handling/checking.
Uwe Hermann [Sat, 8 May 2010 14:09:25 +0000 (16:09 +0200)]
VCD: Improve error handling/checking.

Check malloc()/calloc() return values and so on. Also, add missing
free() calls and some TODOs. Simplify some code.