e10d6e32e4
saleae-logic: support for other FX2 devices (bare FX2)
...
This enables support for devices that have a different VID/PID
than the Saleae Logic, and yet another after firmware upload.
After firmware upload is checked every 100ms whether it came back,
instead of always waiting for 2 seconds.
If the kernel attaches a driver to a device we know, detact it first.
2011-06-05 01:57:54 +02:00
8722c31e26
better cleanup of device/plugin resources
2011-06-05 01:51:49 +02:00
896a19fd65
LA8: Remove trailing whitespace.
2011-05-09 01:04:44 +02:00
d1175d5f7e
LA8: Use sr_spew() where appropriate.
2011-05-09 01:03:27 +02:00
f36cbf60cb
LA8: Improve trigger support and debug output.
2011-05-09 01:03:27 +02:00
a76983fd20
LA8: Eliminate magic numbers.
2011-05-09 00:59:05 +02:00
4d7b525ae9
LA8: Add trigger point support.
...
Report trigger point/position via SR_DF_TRIGGER packet.
2011-05-09 00:59:05 +02:00
5a9660dd4e
demo: Use memset(), might be faster.
2011-05-09 00:59:05 +02:00
c03ed39733
demo: Add all-low/all-high pattern support.
...
Also, improve error handling a bit.
2011-05-09 00:59:04 +02:00
c8f4624d9b
demo: s/genmode/pattern/.
2011-05-05 13:06:15 +02:00
0d31276b05
demo: Rename GENMODE_DEFAULT to GENMODE_SIGROK.
...
Also, add (Doxygen) comments for the currently supported patterns that
the demo device/driver can generate.
2011-05-05 13:06:15 +02:00
68c12597ef
demo: Eliminate unneeded tmp_u64.
2011-05-05 13:06:15 +02:00
d3b1b51cbe
LA8: Free memory from g_*alloc*() via g_freee().
2011-05-05 13:06:14 +02:00
340cfac0f0
log messages: Use device name, not vendor name.
...
There can be multiple devices from the same vendor, obviously.
2011-05-05 13:06:14 +02:00
697785d1ae
libsigrok: closedev() now has a return code.
...
This is useful to allow frontends to react upon close failures in a
way they see fit (e.g. a popup in the GUI, or error message in the CLI).
They can also still ignore the error if they want, of course.
2011-05-05 13:06:14 +02:00
548b08e55c
Drop unneeded skeleton files.
...
They're not too useful as they mostly consist of a list of function names,
and that list is already available in the respective struct. The wiki
API docs and the code in the various hardware/output drivers serve as
useful examples already, no need for additional files.
2011-05-05 13:06:12 +02:00
86f5e3d826
libsigrok: Rename open/close to opendev/closedev.
2011-05-05 13:06:11 +02:00
6f42226475
demo: Add some more debug output.
2011-05-02 01:40:16 +02:00
4362438f1e
LA8: Shrink mangled_buf from 8MB to 4KB.
...
It's not necessary to have an 8MB buffer. Also, make it static, don't
use malloc() here.
2011-04-25 00:21:41 +02:00
da0918aae0
ASIX: Small consistency fixes.
2011-04-25 00:21:40 +02:00
4bc5fd4568
LA8: Eliminate unused num_probes variable.
2011-04-25 00:21:40 +02:00
309397702f
LA8: Replace some sr_warn() with sr_err().
2011-04-25 00:21:40 +02:00
ecaf59db8d
LA8: probeconfig/trigger support.
...
This should make proper trigger support work for ChronoVu LA8.
2011-04-25 00:21:39 +02:00
4af22da595
Fix two small warnings.
2011-04-19 00:27:29 +02:00
e519ba8645
Hardware drivers: Use names for struct entries.
2011-04-19 00:18:06 +02:00
c0a4b9716d
ols: Always use glib's memory allocation functions.
2011-04-19 00:18:05 +02:00
ecad043fd0
MSO19: Always use glib's memory allocation functions.
2011-04-19 00:18:05 +02:00
27a3a6fe4b
demo: Always use glib's memory allocation functions.
2011-04-16 18:08:18 +02:00
c548332c21
serial.c: Use g_try_malloc().
2011-04-16 18:08:18 +02:00
12ad53f5a6
ASIX Sigma: Improve error handling a bit.
2011-04-16 18:08:18 +02:00
92b3101cfc
alsa: Always use glib's memory allocation functions.
2011-04-16 18:08:17 +02:00
2e82a17b5a
LA8: Always use glib's memory allocation functions.
2011-04-16 18:08:17 +02:00
b53738baf7
Replace g_malloc{0,} with g_try_malloc{0,}.
...
The g_malloc()/g_malloc0() versions exit/segfault if not enough memory
is available, which is not a good thing in libsigrok.
Instead, we use the g_try_malloc()/g_try_malloc0() variants, which
return NULL if not enough memory is available, so that the caller can
handle the error properly.
2011-04-16 18:08:15 +02:00
15f2d0c0f2
Don't close/reset the FTDI device too often.
...
Only call la8_close_usb_reset_sequencer() in hw_closedev(), it's not
needed in hw_stop_acquisition().
Thanks Ken Mobley of ChronoVu for the report.
2011-04-15 20:47:26 +02:00
2f5c8c9696
LA8: free() sample buffers in hw_closedev().
...
Thanks Ken Mobley of ChronoVu for the report.
2011-04-15 20:05:45 +02:00
b08024a836
libsigrok: Introduce sr_dbg/sr_info/sr_warn/sr_err.
...
We should use these (internal) functions in libsigrok exclusively from
now on, i.e. no more use of glib's g_debug() etc.
These functions are only for libsigrok, the frontends use whatever
logging mechanism is suitable there.
2011-04-14 10:11:08 +02:00
8703f512a7
LA8: Use the new SR_ERR_ARG macro.
2011-04-10 23:03:33 +02:00
f4314d7e06
Add initial support for the ChronoVu LA8.
2011-04-04 19:40:30 +02:00
8a7b47cdfa
Revert temporary changes for 0.2 release.
2011-04-03 23:18:46 +02:00
2f3aab0ee9
Disable some stuff which should not be in 0.2.
...
Disable decoders, disable lib building.
2011-04-03 22:47:51 +02:00
4fe9a6da79
OLS driver overhaul
...
support for metadata in recent versions of the FPGA code
moved constants and structs out to separate header file
got rid of all device instance-specific globals
2011-04-03 06:18:05 +02:00
82957b65b1
ASIX Sigma: Fix firmware loading bug.
...
When no firmware file is found, return the right error code so sigrok
doesn't continue running with no firmware loaded.
Thanks Martin Stensgård <mastensg@ping.uio.no> for the patch!
2011-03-25 13:44:16 +01:00
c91404191e
Add SR_HZ macro for consistency.
2011-03-03 20:24:24 +01:00
59df0c77e2
Add SR_ prefix to the KHZ/MHZ/GHZ macros.
2011-03-03 20:24:24 +01:00
4cea9eb20d
Make ARRAY_SIZE/ARRAY_AND_SIZE private.
...
This is not libsigrok-specific and should not be part of our API.
2011-02-20 21:16:26 +01:00
54ac5277c5
Constify some more 'char *' parameters.
2011-02-20 21:16:26 +01:00
809c5f2011
Add sr_ prefix for analog stuff some structs.
2011-02-20 21:16:24 +01:00
6f1be0a2d4
Add sr_ prefix to session_{add,remove}.
2011-02-20 21:16:22 +01:00
29cbfeaf5c
Mark some private stuff 'static'.
2011-02-20 21:16:20 +01:00
4bfbf9fce7
demo: forgot second part of samplerate support
2011-02-12 06:14:37 +01:00
e5d1717e6d
Saleae: Make more private stuff static.
2011-02-09 00:07:29 +01:00
60679b18e6
Add sr_ prefix to 'struct samplerates'.
2011-02-08 22:28:01 +01:00
8a2efef2d5
Add sr_ prefix to session related API functions.
2011-02-08 22:28:00 +01:00
1afe89897c
Add sr_ prefix for 'struct probe'.
2011-02-08 22:27:58 +01:00
3bbd9849e9
Fix warnings: g_fopen() needs <glib/gstdio.h>.
2011-02-06 02:14:57 +01:00
868d8cefec
Use glib's g_fopen() instead of fopen().
2011-02-05 20:03:17 +01:00
45fdfa307d
MinGW: Use "b" in all fopen() calls.
...
This is required for proper operation on Windows/MinGW, and doesn't
affect other OSes, most POSIX systems simply ignore the "b".
2011-02-04 23:52:16 +01:00
0f33365007
Revert FIRMWARE_DIR / DECODERS_DIR method for now.
...
There were several issues with the other method, revert for now.
2011-02-04 20:38:20 +01:00
d81d29333e
demo: support setting sample rate
2011-02-04 06:29:41 +01:00
904e0b589e
ols: default to 200KHz samplerate
2011-02-04 06:29:41 +01:00
a9f54bcd7b
MinGW: Build fixes.
2011-02-02 13:13:26 +01:00
22b0238344
Fix build when no libusb-LA is compiled.
...
Until now the build would break if the user doesn't enable at least one
of the libusb1.0-based LAs. I.e., you could not compile only OLS, or
only the demo driver.
2011-02-02 10:25:52 +01:00
cddd1c5f47
demo: stored-pattern generator now keeps state
2011-02-01 06:51:34 +01:00
5a2326a71b
SR_ prefix for all public enums.
2011-01-30 18:32:59 +01:00
6c29007211
Prefixes for *_device_instance.
2011-01-30 18:32:59 +01:00
5c2d46d1db
Prefix device structs with sr_.
2011-01-30 18:32:58 +01:00
9f8274a544
Add a field for the full name of a device.
...
Also, show this long/full name in 'sigrok-cli -V'.
2011-01-30 18:32:58 +01:00
b9c735a275
Prefix datafeed structs with sr_.
2011-01-30 18:32:57 +01:00
d32d961d17
get_sr_device_instance() -> sr_get_device_instance().
2011-01-30 18:32:56 +01:00
a00ba01228
Change all sigrok_ prefixes to sr_.
2011-01-30 18:32:55 +01:00
e46b8fb154
Change SIGROK_ prefix to SR_.
2011-01-30 18:32:53 +01:00
da69237321
Build fix.
2011-01-23 18:21:58 +01:00
108a5bfbba
fix compile warning on 32-bit platforms
2011-01-23 05:32:37 +01:00
070befcd1c
restore demo driver to working state
2011-01-23 05:32:13 +01:00
cdbc51d97d
alsa: hide a few compiler warnings
2011-01-22 12:24:12 -02:00
58330ab892
finish alsa driver implementation
...
Yes, it works now.
2011-01-22 12:24:12 -02:00
6ea7e23526
Revert "re-enable filter and datastore for DF_LOGIC"
...
This reverts commit 23da86dfc0a89c7ab951fea31a318a493830eb69.
2011-01-22 14:18:31 +01:00
921a4c741f
fix copynpaste glitch
2011-01-22 01:01:53 -02:00
6ed4f04437
initial version of alsa plugin.
...
It does NOT work yet.
2011-01-22 00:57:27 -02:00
cfd8b10a2e
alphabetical order
2011-01-21 22:02:32 -02:00
5819184b22
Remove duplicate FIRMWARE_DIR includes.
...
We use AC_DEFINE_UNQUOTED in configure.ac now to put the FIRMWARE_DIR #define
in the config.h file, which is included where we need the #define.
2011-01-21 21:14:37 +01:00
62eeeb171b
re-enable filter and datastore for DF_LOGIC
...
This definitely isn't the proper fix, but it should allow DF_LOGIC
and DF_ANALOG to coexist.
2011-01-21 18:04:09 -02:00
8038e90aef
add a sine wave to demo.c
2011-01-21 12:52:12 -02:00
764f887f7b
change demo.c to output analog packets
...
You need to #define DEMO_ANALOG to generate DF_ANALOG packets.
2011-01-21 02:12:48 -02:00
bffed4fc10
Re-enable stuff we temporarily disabled for 0.1.
2011-01-20 00:43:57 +01:00
07c81bfad1
Disable Link Instruments MSO-19 for 0.1.
2011-01-19 23:55:03 +01:00
26ce0bbfd8
demo: Small indentation fix.
2011-01-19 23:47:21 +01:00
1924f59f4b
Demo: Obery samplerate and fix race condition.
2011-01-19 23:14:17 +01:00
576790ff7b
disable MSO-19 specific stuff for 0.1 release
2011-01-19 22:58:09 +01:00
058b70353d
Move more non-public headers to sigrok-internal.h.
2011-01-19 01:16:19 +01:00
01bd1ed396
Fix compiler warning.
2011-01-19 00:46:54 +01:00
94ba4bd689
Sigma: Update set_configuration to reflect API.
2011-01-18 23:12:57 +01:00
7c70c53843
Sigma: Set default samplerate to 200 KHz.
2011-01-18 22:39:46 +01:00
5b5ea7c6d2
Sigma: Only send trigger packet if enabled.
...
The Sigma hardware emits a default trigger event.
2011-01-18 22:24:23 +01:00
abda62ced8
Sigma: Never send empty packets.
2011-01-18 22:17:43 +01:00
b9cc36296b
demo driver: support time limit
2011-01-17 02:20:52 +01:00
574ce4988a
refuse to set sample limit under 4 (protocol can't handle it)
...
also a bit of whitespace mangling.
2011-01-17 02:18:02 +01:00
88c51afe87
Sigma: Support for decoding partial chunks.
...
Samples are stored in chunks and the last samples do not fill up
a complete chunk. This patch adds support for decoding partial
chunks.
2011-01-16 17:05:14 +01:00
10c471ab13
Fix warnings.
2011-01-16 14:18:26 +01:00
d35aaf0256
demo: Use GIOChannels, makes it work on MinGW.
2011-01-16 14:12:52 +01:00
98b8cbc17e
Sigma: Limit number of edge triggers to 1.
...
Actually, Sigma supports 2 rising/falling triggers,
but they are ORed and the current trigger syntax
does not permit ORed triggers.
2011-01-15 20:01:00 +01:00
31facdd3c5
Sigma: Download samples from partial chunks.
2011-01-15 19:20:31 +01:00
9996570987
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.
2011-01-15 17:04:21 +01:00
1483577eed
Start moving private stuff to sigrok-internal.h.
...
This is work-in-progress, unfinished.
2011-01-15 15:57:54 +01:00
c2bd92ec08
Slightly more consistent #include-guard naming.
2011-01-15 14:48:21 +01:00
917e0e71d5
added example code for generating a stored pattern
2011-01-15 14:28:39 +01:00
9be9893eed
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.
2011-01-15 14:13:23 +01:00
02440dd88c
demo: Cosmetics, constify.
2011-01-15 13:06:04 +01:00
e15f48c268
cleaned up demo driver
...
removed unused samplerate
added patternmode (random and incremental)
2011-01-15 05:12:41 +01:00
63570167d6
Cosmetics for the -D output.
2011-01-15 03:44:19 +01:00
17e1afcb81
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.
2011-01-13 23:52:25 +01:00
2119ab0364
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.
2011-01-12 01:09:31 +01:00
ba3d481bb7
add ontinuous mode for demo driver
2011-01-12 00:25:15 +01:00
a61b0e6a35
configure: Add --enable-demo option.
2011-01-11 22:17:33 +01:00
1fdb75e145
MinGW: Quickfix to make serial.c/ols.c compile.
...
Note: It does NOT actually work, yet, it only compiles!
2011-01-11 01:27:16 +01:00
74b9b43836
cli: support --continuous option for continuous sampling
2011-01-11 00:38:15 +01:00
8a839354c1
Cosmetics, whitespace, consistency fixes.
2011-01-10 23:20:37 +01:00
fc96e6f8c8
demo: Add missing copyright line.
2011-01-10 22:49:38 +01:00
01cf881494
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. :)
2011-01-10 15:15:51 -02:00
c2616fb9fa
update plugins and cli to use new DF_HEADER
2011-01-10 15:12:38 -02:00
ac4a2ea45a
serial.c: fix parity != none
...
The flag write was wrong
2011-01-10 15:05:14 -02:00
1ff7712c93
Finish serial_set_params implementation
...
Adds the most common baud rates and support bits, parity, stopbits
and flocontrol settings.
2011-01-10 02:21:07 -02:00
4c046c6bcc
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.
2011-01-09 06:32:38 +01:00
af812219f6
Only build specific source files if needed.
2011-01-08 20:58:44 +01:00
7c17ac6cc4
Only build hardware drivers if they're enabled.
2011-01-08 20:58:43 +01:00
5096c6a6c1
demo driver: Small cleanups, error handling.
2011-01-08 20:58:42 +01:00
85b5af0687
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 <olivier@aixmarseille.com> for the patch.
2011-01-08 18:29:10 +01:00
5e2ddeb098
Fix two more compiler warnings noticed on amd64.
2011-01-08 03:51:31 +01:00
340f6e7aea
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).
2011-01-08 03:32:25 +01:00
6239c175c1
Initial, unfinished demo/simulation hardware driver.
2011-01-06 19:16:47 +01:00
e6ac9ac808
consistent debug msgs, rename sump to ols
2010-12-29 00:02:30 +01:00
a5e18535ad
don't turn on/off libusb debugging
2010-12-27 23:49:46 +01:00
f0551a6543
oops, fix serial_flush()
2010-08-12 06:04:44 +02:00
06d64eb880
add serial_flush()
2010-08-12 06:02:25 +02:00
a143e4e5dd
don't push configuration to device until acq time
2010-08-12 04:57:09 +02:00
f0d1b53e56
OLS: fix multi-channel capture
2010-08-11 18:37:09 +02:00
edc508d49c
add debug logging (set SIGROK_DEBUG=2 to see)
2010-08-11 04:04:20 +02:00
a803c0db4d
OLS: fix triggers, sample order, capture ratio
2010-08-05 03:54:33 +02:00
b5698bd71e
saleae logic: fix triggers after style changes
2010-07-18 21:57:27 +02:00
38ba252251
Use 'kHz' (not 'KHz') consistently.
2010-05-27 01:51:55 +02:00
5013f07422
skeleton.c: Update to latest prototypes.
2010-05-20 23:41:34 +02:00
2458ea6514
use flexible sample limit specification (k/m/g)
...
HWCAP_LIMIT_SAMPLES is now passed to the driver as *uint64
2010-05-19 21:34:22 +02:00
989938f6cd
Cosmetics: Reduce nesting level a bit.
2010-05-18 00:05:10 +02:00
9a5c6dcf49
Factor out opendev2/opendev3.
2010-05-18 00:05:10 +02:00
5e59f47615
opendev2/opendev3: Don't depend on global vars.
2010-05-18 00:05:09 +02:00
28fc6de055
Cosmetics.
2010-05-18 00:05:09 +02:00
5b15b41e62
sump/ols: Wait 10ms for hw response to make pl2303 reliable
2010-05-09 23:11:08 +02:00
71dda10656
serial: Remove unneccesary nesting
2010-05-09 23:10:23 +02:00
bdfc7a8974
Sigma: Small cleanups.
2010-05-03 22:01:03 +02:00
36b1c8e61b
Sigma: Use software trigger to pinpoint exact sample.
2010-05-03 21:32:03 +02:00
Bert Vermeulen
Uwe Hermann
Daniel Ribeiro
Håvard Espeland
Bert Vermeulen
Håvard Espeland
Olivier Fauchon
Peter Stuge