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
6aac77375b
Sigma: Add state machine for tracking Sigma status.
2010-05-03 19:04:10 +02:00
a42aec7f6e
Sigma: Merge storage of rise/fall triggers.
2010-05-03 15:06:43 +02:00
4ae1f45136
Sigma: Minor cleanups.
2010-05-02 21:59:14 +02:00
11fc8d9d93
Sigma: Set capture ratio correctly.
2010-05-02 21:59:14 +02:00
c53d793f03
Sigma: 50 MHZ falling/rising edge trigger support.
...
Falling/rising edge and value/mask triggers can be combined, e.g.:
--triggers 1=0,2=r,3=1,4=1
2010-05-02 16:32:24 +02:00
f758d0744d
Sigma: Fix simple trigger LUT calculation.
2010-05-02 13:00:41 +02:00
ee492173a1
Sigma: Value/mask trigger support in 50 MHz mode.
2010-05-01 23:16:27 +02:00
eec5275e2f
Sigma: Small cleanups.
2010-05-01 23:16:18 +02:00
e65679b15e
Saleae: Rename firmware file to saleae-logic.fw.
...
This is done for consistency with the ASIX SIGMA firmware file names,
and also for brevity.
2010-05-01 02:41:37 +02:00
57bbf56b84
Sigma: Add triggers support for 100 and 200 MHz.
2010-05-01 00:00:57 +02:00
ed09fd07f7
Sigma: Minor cleanup and add more samplesrates.
2010-04-30 23:54:14 +02:00
9ddb2a125d
Sigma: Small cosmetic fixes.
2010-04-29 00:32:44 +02:00
edca2c5c22
Sigma: Support for low samplerates
...
Lowest samplerate supported in driver is 250 KHz
2010-04-28 22:45:13 +02:00
f78898e947
Sigma: Support 50 and 200 MHz modes
2010-04-28 21:24:41 +02:00
a8116d764b
Sigma: Rename firmware files
2010-04-28 21:20:27 +02:00
e8397563a2
Sigma: Upload 50, 100 or 200 MHz firmware
2010-04-28 20:01:15 +02:00
f6564c8d19
Sigma: Move upload firmware into a function
2010-04-28 19:51:13 +02:00
fefa18001a
ASIX SIGMA: Coding style fixes (via indent mostly).
...
Also, end all/most comments with full stop and avoid variable/array
definitions in the middle of functions.
2010-04-28 00:17:28 +02:00
204b1629bd
asix-sigma.h: Add missing license header.
2010-04-27 22:46:59 +02:00
911f18341b
ASIX Sigma: Use common license header format.
2010-04-27 22:44:15 +02:00
28a35d8ab3
This commit adds initial support for the Asix Sigma Logic Analyzer. Currently, only 200 MHz is supported, and only with software trigger. Firmware for the device will be distributed separately, with permission from the vendor.
...
Signed-off-by: Håvard Espeland <gus@ping.uio.no>
2010-04-27 13:16:01 -07:00
926b866cb6
Win: Fix compile, serial port code (unfinished).
2010-04-22 03:39:02 +02:00
eee4890f2f
fix broken samplerate calculation
2010-04-17 23:11:58 -07:00
9c48090a88
fix double DF_END and libusb timeout
2010-04-17 23:11:57 -07:00
9a4988343f
Oops, bugfixes.
2010-04-15 23:24:44 +02:00
408e719989
Refactoring and code simplifications.
2010-04-15 23:21:30 +02:00
fed16f06e2
Saleae/Zeroplus: Coding style fixes.
2010-04-15 22:59:43 +02:00
43fc7885d3
OLS: Coding style fixes.
2010-04-15 22:16:35 +02:00
986f7270bf
hardware/common: Coding style fixes.
2010-04-15 20:55:57 +02:00
fdd20b5239
Add ARRAY_SIZE helper.
2010-04-13 00:34:20 +02:00
afc8e4deb6
Fix all warnings and re-enable -Wextra.
2010-04-09 22:18:46 +02:00
86c5e27908
zeroplus: Fix compiler warnings.
2010-04-09 21:20:22 +02:00
08cfe6a2b7
Factor out trigger_helper() to reduce nesting.
2010-04-09 21:16:11 +02:00
edf60d0575
Factor out common ezusb_upload_firmware().
2010-04-09 20:44:51 +02:00
9d2933fbe9
ezusb.c: Coding style fixes.
2010-04-09 20:36:29 +02:00
904299164f
sl_open_device(): Refactoring to reduce nesting.
2010-04-09 20:31:43 +02:00
f6958dabcd
Simplify code by reducing nesting level.
2010-04-09 19:25:29 +02:00
6f5f21f996
Coding style fixes, aided by 'indent'.
...
The following shell alias can be used:
alias INDENT='indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs'
2010-04-09 19:04:36 +02:00
d02a535e05
move posix-specific serial port comms to serial.c
2010-04-09 05:15:27 +02:00
54dc4bc703
switch to SIGROK_ERR
2010-04-08 16:58:07 +02:00
6937bb757e
various fixes, basic acquisition works
2010-04-08 16:54:06 +02:00
54b38f64aa
use strdup() instead of g_strdup()
2010-04-08 16:50:27 +02:00
e31b636df6
Start unification of libsigrok return codes.
...
We have SIGROK_OK for functions calls where no errors occured. All
error code names start with SIGROK_ERR and are globally unique,
negative values.
The value SIGROK_ERR is a generic/unspecified error code, all others,
such as SIGROK_ERR_MALLOC, refer to a specific error condition.
This commit renames the old SIGROK_NOK etc.
2010-04-05 18:30:14 +02:00
4c100f3244
More consistent spelling of "samplerate".
2010-04-05 18:30:02 +02:00
a1bb33afbd
Start of code base layout restructuring.
2010-04-02 20:27:54 +02:00
Bert Vermeulen
Uwe Hermann
Daniel Ribeiro
Håvard Espeland
Bert Vermeulen
Håvard Espeland
Olivier Fauchon
Peter Stuge
Bert Vermeulen