Commit Graph

1221 Commits

Author SHA1 Message Date
Uwe Hermann 7c17ac6cc4 Only build hardware drivers if they're enabled. 2011-01-08 20:58:43 +01:00
Uwe Hermann 5096c6a6c1 demo driver: Small cleanups, error handling. 2011-01-08 20:58:42 +01:00
Uwe Hermann 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
Uwe Hermann 5e2ddeb098 Fix two more compiler warnings noticed on amd64. 2011-01-08 03:51:31 +01:00
Uwe Hermann 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
Uwe Hermann 6239c175c1 Initial, unfinished demo/simulation hardware driver. 2011-01-06 19:16:47 +01:00
Bert Vermeulen e6ac9ac808 consistent debug msgs, rename sump to ols 2010-12-29 00:02:30 +01:00
Bert Vermeulen a5e18535ad don't turn on/off libusb debugging 2010-12-27 23:49:46 +01:00
Bert Vermeulen f0551a6543 oops, fix serial_flush() 2010-08-12 06:04:44 +02:00
Bert Vermeulen 06d64eb880 add serial_flush() 2010-08-12 06:02:25 +02:00
Bert Vermeulen a143e4e5dd don't push configuration to device until acq time 2010-08-12 04:57:09 +02:00
Bert Vermeulen f0d1b53e56 OLS: fix multi-channel capture 2010-08-11 18:37:09 +02:00
Bert Vermeulen edc508d49c add debug logging (set SIGROK_DEBUG=2 to see) 2010-08-11 04:04:20 +02:00
Bert Vermeulen a803c0db4d OLS: fix triggers, sample order, capture ratio 2010-08-05 03:54:33 +02:00
Bert Vermeulen b5698bd71e saleae logic: fix triggers after style changes 2010-07-18 21:57:27 +02:00
Uwe Hermann 38ba252251 Use 'kHz' (not 'KHz') consistently. 2010-05-27 01:51:55 +02:00
Uwe Hermann 5013f07422 skeleton.c: Update to latest prototypes. 2010-05-20 23:41:34 +02:00
Bert Vermeulen 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
Uwe Hermann 989938f6cd Cosmetics: Reduce nesting level a bit. 2010-05-18 00:05:10 +02:00
Uwe Hermann 9a5c6dcf49 Factor out opendev2/opendev3. 2010-05-18 00:05:10 +02:00
Uwe Hermann 5e59f47615 opendev2/opendev3: Don't depend on global vars. 2010-05-18 00:05:09 +02:00
Uwe Hermann 28fc6de055 Cosmetics. 2010-05-18 00:05:09 +02:00
Peter Stuge 5b15b41e62 sump/ols: Wait 10ms for hw response to make pl2303 reliable 2010-05-09 23:11:08 +02:00
Peter Stuge 71dda10656 serial: Remove unneccesary nesting 2010-05-09 23:10:23 +02:00
Håvard Espeland bdfc7a8974 Sigma: Small cleanups. 2010-05-03 22:01:03 +02:00
Håvard Espeland 36b1c8e61b Sigma: Use software trigger to pinpoint exact sample. 2010-05-03 21:32:03 +02:00
Håvard Espeland 6aac77375b Sigma: Add state machine for tracking Sigma status. 2010-05-03 19:04:10 +02:00
Håvard Espeland a42aec7f6e Sigma: Merge storage of rise/fall triggers. 2010-05-03 15:06:43 +02:00
Håvard Espeland 4ae1f45136 Sigma: Minor cleanups. 2010-05-02 21:59:14 +02:00
Håvard Espeland 11fc8d9d93 Sigma: Set capture ratio correctly. 2010-05-02 21:59:14 +02:00
Håvard Espeland 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
Håvard Espeland f758d0744d Sigma: Fix simple trigger LUT calculation. 2010-05-02 13:00:41 +02:00
Håvard Espeland ee492173a1 Sigma: Value/mask trigger support in 50 MHz mode. 2010-05-01 23:16:27 +02:00
Håvard Espeland eec5275e2f Sigma: Small cleanups. 2010-05-01 23:16:18 +02:00
Uwe Hermann 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
Håvard Espeland 57bbf56b84 Sigma: Add triggers support for 100 and 200 MHz. 2010-05-01 00:00:57 +02:00
Håvard Espeland ed09fd07f7 Sigma: Minor cleanup and add more samplesrates. 2010-04-30 23:54:14 +02:00
Uwe Hermann 9ddb2a125d Sigma: Small cosmetic fixes. 2010-04-29 00:32:44 +02:00
Håvard Espeland edca2c5c22 Sigma: Support for low samplerates
Lowest samplerate supported in driver is 250 KHz
2010-04-28 22:45:13 +02:00
Håvard Espeland f78898e947 Sigma: Support 50 and 200 MHz modes 2010-04-28 21:24:41 +02:00
Håvard Espeland a8116d764b Sigma: Rename firmware files 2010-04-28 21:20:27 +02:00
Håvard Espeland e8397563a2 Sigma: Upload 50, 100 or 200 MHz firmware 2010-04-28 20:01:15 +02:00
Håvard Espeland f6564c8d19 Sigma: Move upload firmware into a function 2010-04-28 19:51:13 +02:00
Uwe Hermann 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
Uwe Hermann 204b1629bd asix-sigma.h: Add missing license header. 2010-04-27 22:46:59 +02:00
Uwe Hermann 911f18341b ASIX Sigma: Use common license header format. 2010-04-27 22:44:15 +02:00
Håvard Espeland 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
Uwe Hermann 926b866cb6 Win: Fix compile, serial port code (unfinished). 2010-04-22 03:39:02 +02:00
Bert Vermeulen eee4890f2f fix broken samplerate calculation 2010-04-17 23:11:58 -07:00
Bert Vermeulen 9c48090a88 fix double DF_END and libusb timeout 2010-04-17 23:11:57 -07:00
Uwe Hermann 9a4988343f Oops, bugfixes. 2010-04-15 23:24:44 +02:00
Uwe Hermann 408e719989 Refactoring and code simplifications. 2010-04-15 23:21:30 +02:00
Uwe Hermann fed16f06e2 Saleae/Zeroplus: Coding style fixes. 2010-04-15 22:59:43 +02:00
Uwe Hermann 43fc7885d3 OLS: Coding style fixes. 2010-04-15 22:16:35 +02:00
Uwe Hermann 986f7270bf hardware/common: Coding style fixes. 2010-04-15 20:55:57 +02:00
Uwe Hermann fdd20b5239 Add ARRAY_SIZE helper. 2010-04-13 00:34:20 +02:00
Uwe Hermann afc8e4deb6 Fix all warnings and re-enable -Wextra. 2010-04-09 22:18:46 +02:00
Uwe Hermann 86c5e27908 zeroplus: Fix compiler warnings. 2010-04-09 21:20:22 +02:00
Uwe Hermann 08cfe6a2b7 Factor out trigger_helper() to reduce nesting. 2010-04-09 21:16:11 +02:00
Uwe Hermann edf60d0575 Factor out common ezusb_upload_firmware(). 2010-04-09 20:44:51 +02:00
Uwe Hermann 9d2933fbe9 ezusb.c: Coding style fixes. 2010-04-09 20:36:29 +02:00
Uwe Hermann 904299164f sl_open_device(): Refactoring to reduce nesting. 2010-04-09 20:31:43 +02:00
Uwe Hermann f6958dabcd Simplify code by reducing nesting level. 2010-04-09 19:25:29 +02:00
Uwe Hermann 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
Bert Vermeulen d02a535e05 move posix-specific serial port comms to serial.c 2010-04-09 05:15:27 +02:00
Bert Vermeulen 54dc4bc703 switch to SIGROK_ERR 2010-04-08 16:58:07 +02:00
Bert Vermeulen 6937bb757e various fixes, basic acquisition works 2010-04-08 16:54:06 +02:00
Bert Vermeulen 54b38f64aa use strdup() instead of g_strdup() 2010-04-08 16:50:27 +02:00
Uwe Hermann 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
Uwe Hermann 4c100f3244 More consistent spelling of "samplerate". 2010-04-05 18:30:02 +02:00
Uwe Hermann a1bb33afbd Start of code base layout restructuring. 2010-04-02 20:27:54 +02:00