]> sigrok.org Git - libsigrok.git/log
libsigrok.git
11 years agoAdjust session debugging to the new SR_DF_META packets.
Bert Vermeulen [Sun, 20 Jan 2013 15:37:23 +0000 (16:37 +0100)]
Adjust session debugging to the new SR_DF_META packets.

11 years agoDeprecate SR_HWOPT_MODEL
Bert Vermeulen [Sun, 20 Jan 2013 15:36:35 +0000 (16:36 +0100)]
Deprecate SR_HWOPT_MODEL

This was only ever used for the defunct genericdmm driver.

11 years agoUse new struct sr_config_info for option metadata
Bert Vermeulen [Sun, 20 Jan 2013 15:35:25 +0000 (16:35 +0100)]
Use new struct sr_config_info for option metadata

11 years agoAdd small helper for creating struct sr_config
Bert Vermeulen [Sun, 20 Jan 2013 15:34:38 +0000 (16:34 +0100)]
Add small helper for creating struct sr_config

11 years agoAdjust option helpers to new sr_config struct
Bert Vermeulen [Sun, 20 Jan 2013 15:33:24 +0000 (16:33 +0100)]
Adjust option helpers to new sr_config struct

11 years agoUse new SR_DF_META packet.
Bert Vermeulen [Sun, 20 Jan 2013 14:45:09 +0000 (15:45 +0100)]
Use new SR_DF_META packet.

Since input modules determine a samplerate by reading from their
file format (or having it overridden with an option), they need
to pass this up to the frontend.

11 years agofree USB config descriptor after use
Bert Vermeulen [Sat, 19 Jan 2013 12:20:34 +0000 (13:20 +0100)]
free USB config descriptor after use

11 years agodrivers: use new sr_config struct
Bert Vermeulen [Sun, 6 Jan 2013 16:41:30 +0000 (17:41 +0100)]
drivers: use new sr_config struct

Sending an SR_DF_META packet at the start of every stream is not
mandatory; the frontend should ask for what it needs, and any extra
information the driver wants to send will come in due time.

11 years agounify sr_datafeed_meta_* into one struct containing sr_config
Bert Vermeulen [Sun, 6 Jan 2013 15:37:41 +0000 (16:37 +0100)]
unify sr_datafeed_meta_* into one struct containing sr_config

struct sr_config is the new name for sr_hwopt. Its companion meta
struct, sr_hwcap_option, was renamed sr_config_info.

11 years agoserial.c: Fix copy-paste error.
Uwe Hermann [Mon, 21 Jan 2013 00:47:30 +0000 (01:47 +0100)]
serial.c: Fix copy-paste error.

Thanks Bert Vermeulen for reporting.

11 years agouni-t-dmm: Quickfix for UNI-T UT61D.
Uwe Hermann [Mon, 21 Jan 2013 00:45:02 +0000 (01:45 +0100)]
uni-t-dmm: Quickfix for UNI-T UT61D.

This is a temporary fix only, since a major rework of uni-t-dmm is being
done at the moment, soon to be merged.

11 years agoAdd missing "ULL" suffixes.
Uwe Hermann [Sat, 19 Jan 2013 21:00:39 +0000 (22:00 +0100)]
Add missing "ULL" suffixes.

These numbers are larger than 32bit, mark them as ULL to avoid compile
failures on 32bit systems.

11 years agouni-t-dmm: Expose hwopts.
Uwe Hermann [Sun, 20 Jan 2013 18:57:04 +0000 (19:57 +0100)]
uni-t-dmm: Expose hwopts.

11 years agouni-t-dmm: Fix scanning, properly use new sr_usb_find().
Uwe Hermann [Sun, 20 Jan 2013 18:55:33 +0000 (19:55 +0100)]
uni-t-dmm: Fix scanning, properly use new sr_usb_find().

11 years agoRemove non-error hw_info_get() messages.
Uwe Hermann [Sun, 20 Jan 2013 17:48:02 +0000 (18:48 +0100)]
Remove non-error hw_info_get() messages.

Currently hw_info_get() can receive requests for entries (info_id) that
the specific driver doesn't support. That is (right now) a valid
use-case and not an error (might change later, though).

Thus, for now, don't output messages for such requests at all (certainly
not as sr_err() where they show up in e.g. sigrok-cli output per default).

11 years agoudev: Add UNI-T UT-D04 multimeter cable entry.
Uwe Hermann [Sun, 20 Jan 2013 17:47:35 +0000 (18:47 +0100)]
udev: Add UNI-T UT-D04 multimeter cable entry.

11 years agoconfigure.ac: Drop AC_PROG_CXX.
Uwe Hermann [Sat, 19 Jan 2013 20:20:56 +0000 (21:20 +0100)]
configure.ac: Drop AC_PROG_CXX.

We don't need a C++ compiler for libsigrok, so don't check for one.

This would cause a build failure on all systems where there is a C compiler
but no C++ compiler installed.

11 years agoREADME: Document alsa (optional) library.
Uwe Hermann [Sat, 19 Jan 2013 18:13:52 +0000 (19:13 +0100)]
README: Document alsa (optional) library.

11 years agoserial.c: OpenBSD doesn't have B460800.
Uwe Hermann [Sat, 19 Jan 2013 14:55:22 +0000 (15:55 +0100)]
serial.c: OpenBSD doesn't have B460800.

11 years agoconfigure.ac: Drop gthread check, no longer used.
Uwe Hermann [Wed, 16 Jan 2013 00:31:46 +0000 (01:31 +0100)]
configure.ac: Drop gthread check, no longer used.

We no longer use gthread (its only user was the 'demo' driver), so drop
the 'configure' check for it.

The libsigrok.pc pkg-config file is still correct, since the 'configure'
result propagates there automatically.

11 years agoalsa: Silence ALSA scanning process.
Uwe Hermann [Tue, 15 Jan 2013 23:02:24 +0000 (00:02 +0100)]
alsa: Silence ALSA scanning process.

Errors while opening or configuring ALSA devices during scan for devices
should not be shown by default (i.e., no sr_err() usage). Non-working
or non-accessible devices (due to permissions or other reasons) will
simply not show up in frontends. Use sr_dbg() instead of sr_err().

11 years agoGet rid of obsolete SR_DI_NUM_PROBES and SR_DI_PROBE_NAMES.
Bert Vermeulen [Tue, 15 Jan 2013 16:20:57 +0000 (17:20 +0100)]
Get rid of obsolete SR_DI_NUM_PROBES and SR_DI_PROBE_NAMES.

Frontends should use the probe list in the device's sr_dev_inst
to get this information.

11 years agoMakefile.am: Fix typo in 'ChangeLog' target.
Uwe Hermann [Mon, 14 Jan 2013 10:13:58 +0000 (11:13 +0100)]
Makefile.am: Fix typo in 'ChangeLog' target.

11 years agocosmetics
Bert Vermeulen [Sun, 13 Jan 2013 23:59:46 +0000 (00:59 +0100)]
cosmetics

11 years agoadd --disable-all-drivers option
Bert Vermeulen [Sun, 13 Jan 2013 23:52:55 +0000 (00:52 +0100)]
add --disable-all-drivers option

Can be overridden by driver --enable options to build only those drivers.

11 years agorigol-ds1xx2: More selective Rigol DS1xx2 scan
Bert Vermeulen [Sun, 13 Jan 2013 21:42:21 +0000 (22:42 +0100)]
rigol-ds1xx2: More selective Rigol DS1xx2 scan

Patch submitted by Martin Ling.

11 years agocleanup of obsolete definition
Bert Vermeulen [Sun, 13 Jan 2013 17:07:05 +0000 (18:07 +0100)]
cleanup of obsolete definition

11 years agosr_session_save(): don't use datastore
Bert Vermeulen [Tue, 8 Jan 2013 01:51:03 +0000 (02:51 +0100)]
sr_session_save(): don't use datastore

11 years agoremove datastore functionality
Bert Vermeulen [Mon, 7 Jan 2013 01:10:33 +0000 (02:10 +0100)]
remove datastore functionality

Keeping a copy of acquired data is up to the frontend, not libsigrok.

11 years agouse a dynamically expanding probe list
Bert Vermeulen [Mon, 7 Jan 2013 00:52:02 +0000 (01:52 +0100)]
use a dynamically expanding probe list

11 years agofx2lafw: Say if chip is old FX2 or FX2LP
Alexandru Gagniuc [Sun, 6 Jan 2013 15:31:30 +0000 (09:31 -0600)]
fx2lafw: Say if chip is old FX2 or FX2LP

Look at the extracted REVID, and print out if it is an FX2 (non-LP), or FX2LP.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agolink-mso19: Use more portable g_htons().
Uwe Hermann [Tue, 8 Jan 2013 02:12:01 +0000 (03:12 +0100)]
link-mso19: Use more portable g_htons().

Not all systems provide <arpa/inet.h> and/or htons(). Use portable and
always available g_htons() from glib instead.

11 years agolink-mso19: Fix a bunch of compiler warnings.
Uwe Hermann [Tue, 8 Jan 2013 02:02:53 +0000 (03:02 +0100)]
link-mso19: Fix a bunch of compiler warnings.

11 years agolink-mso19: Fix white-space, cosmetics, coding-style.
Uwe Hermann [Tue, 8 Jan 2013 01:48:49 +0000 (02:48 +0100)]
link-mso19: Fix white-space, cosmetics, coding-style.

Fix the bare minumum of whitespace/indentation/coding-style via
automatic 'indent' run, followed by some minor manual fixes.
Some more fixes and cleanups might follow later.

11 years agolink-mso19: Fix (C) lines.
Uwe Hermann [Tue, 8 Jan 2013 01:30:40 +0000 (02:30 +0100)]
link-mso19: Fix (C) lines.

Bring back the original (C) lines from before the split into api.c
and protocol.[ch].

Add "Copyright (C) 2013 Lior Elazary <redacted>" since there
were nontrivial changes to those files.

11 years agoconfigure.ac: Enable Link Instruments MSO-19.
Uwe Hermann [Tue, 8 Jan 2013 00:27:11 +0000 (01:27 +0100)]
configure.ac: Enable Link Instruments MSO-19.

This driver now compiles again and (partially) seems to work, so enable it.

11 years agoAdded limit samples Eveything seems to work find up to 1024 samples
lelazary [Mon, 7 Jan 2013 15:49:31 +0000 (07:49 -0800)]
Added limit samples Eveything seems to work find up to 1024 samples

11 years agoRewrote the trigger config. Added trigger position and trigger slope
lelazary [Sun, 6 Jan 2013 17:46:01 +0000 (09:46 -0800)]
Rewrote the trigger config. Added trigger position and trigger slope

11 years agoEveything seems to work now except for triggers.
lelazary [Sun, 6 Jan 2013 02:12:45 +0000 (18:12 -0800)]
Eveything seems to work now except for triggers.

11 years agoMore cleanup. Communication with mso19 is working, but its not triggering. Need to...
lelazary [Sat, 5 Jan 2013 17:29:00 +0000 (09:29 -0800)]
More cleanup. Communication with mso19 is working, but its not triggering. Need to check why.

11 years agoAdded flow control to serial configuration to support xon/xoff for link-mso19
lelazary [Sat, 5 Jan 2013 17:00:52 +0000 (09:00 -0800)]
Added flow control to serial configuration to support xon/xoff for link-mso19

11 years agoAdded missing mso functions
lelazary [Sat, 5 Jan 2013 01:22:15 +0000 (17:22 -0800)]
Added missing mso functions

11 years agoRemoving the old link-mso19 files and changing makefile
lelazary [Sat, 5 Jan 2013 01:05:17 +0000 (17:05 -0800)]
Removing the old link-mso19 files and changing makefile

11 years agoRewrote the link-mso19.c into api and protocol. Still need to test and cleanup some...
lelazary [Sat, 5 Jan 2013 01:03:20 +0000 (17:03 -0800)]
Rewrote the link-mso19.c into api and protocol. Still need to test and cleanup some more

11 years agoAdd gnuplot_rigol_ds1xx2.gpi gnuplot script.
Uwe Hermann [Thu, 3 Jan 2013 18:17:51 +0000 (19:17 +0100)]
Add gnuplot_rigol_ds1xx2.gpi gnuplot script.

This is a very simple gnuplot script for testing the Rigol DS1xx2 driver.
It currently has various issues and limitations (e.g. only one channel
is displayed, the scaling is not usable, and so on) to be fixed later.

11 years agorigol-ds1xx2: Cosmetics, whitespace.
Uwe Hermann [Thu, 3 Jan 2013 18:04:11 +0000 (19:04 +0100)]
rigol-ds1xx2: Cosmetics, whitespace.

11 years agorigol-ds1xx2: Autoprobe for usbtmc devices on Linux.
Martin Ling [Sun, 30 Dec 2012 14:29:00 +0000 (15:29 +0100)]
rigol-ds1xx2: Autoprobe for usbtmc devices on Linux.

11 years agorigol-ds1xx2: Fix setting trigger parameters.
Martin Ling [Sun, 30 Dec 2012 13:17:08 +0000 (14:17 +0100)]
rigol-ds1xx2: Fix setting trigger parameters.

11 years agorigol-ds1xx2: Assorted parameter setting fixes.
Martin Ling [Sun, 30 Dec 2012 13:06:58 +0000 (14:06 +0100)]
rigol-ds1xx2: Assorted parameter setting fixes.

11 years agorigol-ds1xx2: First working version.
Martin Ling [Sun, 30 Dec 2012 03:17:56 +0000 (04:17 +0100)]
rigol-ds1xx2: First working version.

Currently hardcoded to use /dev/usbtmc1. Analog data readout works.

11 years agorigol-ds1xx2: Initial driver skeleton.
Martin Ling [Sat, 29 Dec 2012 21:22:10 +0000 (22:22 +0100)]
rigol-ds1xx2: Initial driver skeleton.

11 years agools: Implement SR_DI_HWOPTS.
Uwe Hermann [Thu, 3 Jan 2013 01:15:27 +0000 (02:15 +0100)]
ols: Implement SR_DI_HWOPTS.

11 years agoserial-dmm: Add UNI-T UT61E support (UT-D02 cable).
Uwe Hermann [Wed, 26 Dec 2012 00:53:50 +0000 (01:53 +0100)]
serial-dmm: Add UNI-T UT61E support (UT-D02 cable).

11 years agoAdd Cyrustek ES51922 DMM chip parser.
Uwe Hermann [Wed, 7 Nov 2012 18:10:36 +0000 (19:10 +0100)]
Add Cyrustek ES51922 DMM chip parser.

11 years agoalsa: Add some more samplerates.
Uwe Hermann [Mon, 31 Dec 2012 23:33:05 +0000 (00:33 +0100)]
alsa: Add some more samplerates.

Add some more samplerates that seem to be supported by some devices
(found via random grepping of alsa and kernel sources).

11 years agoalsa: Add missing % for PRIu64.
Uwe Hermann [Mon, 31 Dec 2012 22:31:48 +0000 (23:31 +0100)]
alsa: Add missing % for PRIu64.

11 years agoalsa: Improved error reporting.
Uwe Hermann [Mon, 31 Dec 2012 22:31:31 +0000 (23:31 +0100)]
alsa: Improved error reporting.

11 years agoalsa: Cosmetics, coding style, typos.
Uwe Hermann [Mon, 31 Dec 2012 21:54:17 +0000 (22:54 +0100)]
alsa: Cosmetics, coding style, typos.

11 years agoalsa: Find supported samplerates during device scan
Alexandru Gagniuc [Wed, 26 Dec 2012 18:11:33 +0000 (12:11 -0600)]
alsa: Find supported samplerates during device scan

Since we are using the 'hw' interface of ALSA, we don't have the luxury of
samplerate conversion, given by the 'plughw' interface. If we try to set a
samplerate that is not supported, ALSA will just throw an error.

We can test for the supported samplerates, and create a list of supported
samplerates, then limit the selection to only those values. The frontend can
query the list of supported samplerates.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoalsa: Fix sample acquisition and send normalized values
Alexandru Gagniuc [Sun, 23 Dec 2012 18:57:37 +0000 (12:57 -0600)]
alsa: Fix sample acquisition and send normalized values

The alsa driver requested signed 16-bit integers from ALSA, but casted them to
to an unsigned 16bit before finally casting them to a float. The end result was
that half of the wave would be clipped off.
We also requested data in little endian format. ALSA can be instructed to send
data with the correct endianness for the platform, without needing to worry
about what that is.

This patch attempts three points, which, together, fix the acquisition:
1) Request data from ALSA without specifying endianness; ALSA will handle the
endianness.
2) Simplify the int16_t to float loop by using straightforward indexes.
3) Normalize every value before sending it on the session bus.

NOTE: If testing with PulseView, it will appear as if sigrok is sending all
zeroes. sigrok is sending correct data, but since the data is normalized,
PulseView will incorrectly plot it as a straight line.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoalsa: Scan all soundcards and create a sigrok device per input
Alexandru Gagniuc [Thu, 20 Dec 2012 19:47:09 +0000 (13:47 -0600)]
alsa: Scan all soundcards and create a sigrok device per input

The alsa driver only works with device "default". This limits the driver's
scope to whatever device ALSA deems to be "default". It is desirable to have
access to all ALSA devices from sigrok.

Change the alsa device scan so that:
Each alsa device (not alsa card) gets its own sigrok device
For example,
    hw:1,0 == sigrok device 0
    hw:1,1 == sigrok device 1
    hw:2,0 == sigrok device 2
    hw:2,1 == sigrok device 3
    hw:2,2 == sigrok device 4
    [...]

We don't currently look at alsa subdevices. We only use subdevice 0.
Every input device will have its own channels (left, right, etc). Each of
those channels gets mapped to a different sigrok probe. A device with 4
channels will have 4 probes from sigrok's perspective.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoalsa: Do not use snd_pcm_hw_params_set_rate_near()
Alexandru Gagniuc [Thu, 27 Dec 2012 02:14:54 +0000 (20:14 -0600)]
alsa: Do not use snd_pcm_hw_params_set_rate_near()

snd_pcm_hw_params_set_rate_near() will try to use the samplerate closest to the
given value, potentially starting the acquisition with a different samplerate
than the one specified.

Instead, use snd_pcm_hw_params_set_rate(). It will return an error if the
samplerate is not supported by the hardware, which is arguably better than
collecting data with a different samplerate than the one specified.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agors9lcd: Add missing 'break;'
Alexandru Gagniuc [Mon, 31 Dec 2012 21:14:49 +0000 (15:14 -0600)]
rs9lcd: Add missing 'break;'

A break was missing for "case MODE_AMP_WIDTH:" in sr_rs9lcd_parse().

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoasix-sigma: Fix two compiler warnings.
Uwe Hermann [Mon, 31 Dec 2012 20:21:39 +0000 (21:21 +0100)]
asix-sigma: Fix two compiler warnings.

asix-sigma.c:648:9: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]

asix-sigma.c:1337:20: warning: 'triggerselect' may be used uninitialized
in this function [-Wmaybe-uninitialized]

11 years agosession: Fix compiler warning.
Uwe Hermann [Mon, 31 Dec 2012 20:05:11 +0000 (21:05 +0100)]
session: Fix compiler warning.

session.c:258:6: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]

11 years agovictor-dmm: Fix compiler warning.
Uwe Hermann [Mon, 31 Dec 2012 20:03:45 +0000 (21:03 +0100)]
victor-dmm: Fix compiler warning.

protocol.c:106:10: warning: 'factor' may be used uninitialized in this
function [-Wmaybe-uninitialized]

11 years agonexus-osciprime: Fix compiler warning.
Uwe Hermann [Mon, 31 Dec 2012 20:02:14 +0000 (21:02 +0100)]
nexus-osciprime: Fix compiler warning.

protocol.c:26:46: warning: unused parameter 'fd' [-Wunused-parameter]

11 years agouni-t-dmm: Fix compiler warning.
Uwe Hermann [Mon, 31 Dec 2012 20:01:53 +0000 (21:01 +0100)]
uni-t-dmm: Fix compiler warning.

protocol.c:84:5: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]

11 years agors9lcd: Fix compiler warning.
Uwe Hermann [Mon, 31 Dec 2012 19:58:14 +0000 (20:58 +0100)]
rs9lcd: Fix compiler warning.

rs9lcd.c:289:19: warning: 'rawval' may be used uninitialized in this
function [-Wmaybe-uninitialized]

11 years agoadd USBTMC device search helper
Bert Vermeulen [Sun, 30 Dec 2012 00:44:58 +0000 (01:44 +0100)]
add USBTMC device search helper

11 years agotondaj-sl-814: remove unneeded debugging
Bert Vermeulen [Sat, 29 Dec 2012 10:19:19 +0000 (11:19 +0100)]
tondaj-sl-814: remove unneeded debugging

11 years agools: Add missing 'extern'.
Uwe Hermann [Fri, 28 Dec 2012 16:13:20 +0000 (17:13 +0100)]
ols: Add missing 'extern'.

11 years agoadded VID:PIDs for all Hantek DSO-2xxx/5xxx
Bert Vermeulen [Fri, 28 Dec 2012 15:46:21 +0000 (16:46 +0100)]
added VID:PIDs for all Hantek DSO-2xxx/5xxx

11 years agoconfigure.ac: Fix CFLAGS settings.
Uwe Hermann [Fri, 28 Dec 2012 10:22:16 +0000 (11:22 +0100)]
configure.ac: Fix CFLAGS settings.

Don't override/overwrite CFLAGS in configure.ac, but rather amend it
with (currently) "-Wall -Wextra -fvisibility=hidden".

This properly allows users/packagers to do things like:

 ./configure (this will default to using "-g -O2" additionally)

 CFLAGS="-g -O2" ./configure (same as above)

 CFLAGS="" ./configure (no additional flags)

 CFLAGS="-g -O0" ./configure (disable optimization, e.g. for valgrind use)

 etc. etc.

11 years agoserial-dmm: Rename VOLTCRAFT_VC820 to VOLTCRAFT_VC820_SER.
Uwe Hermann [Wed, 19 Dec 2012 21:50:07 +0000 (22:50 +0100)]
serial-dmm: Rename VOLTCRAFT_VC820 to VOLTCRAFT_VC820_SER.

This matches the _ser suffix of the other functions/variables for this
device ("ser" denotes that it is used with the serial UNI-T UT-D02 cable
as opposed the USB/HID based cables which are handled by the uni-t-dmm driver).

But more importantly, the _SER suffix for the enum value will prevent
name clashes later, when the uni-t-dmm driver gets a VOLTCRAFT_VC820 enum.

Do the same for VOLTCRAFT_VC840.

11 years agoFix limit_samples check in various drivers.
Uwe Hermann [Wed, 26 Dec 2012 00:29:27 +0000 (01:29 +0100)]
Fix limit_samples check in various drivers.

Check whether a sample limit was actually set (> 0) before checking if
that sample limit is reached. This also fixes continuous acquisition mode
for drivers which have that.

11 years agoShorten probe_names[] arrays everywhere.
Uwe Hermann [Tue, 25 Dec 2012 23:12:52 +0000 (00:12 +0100)]
Shorten probe_names[] arrays everywhere.

Also, NULL-terminate all of them.

11 years agonexus-osciprime: suppress warnings
Bert Vermeulen [Tue, 25 Dec 2012 23:01:37 +0000 (00:01 +0100)]
nexus-osciprime: suppress warnings

11 years agoserial-dmm: Handle time-limited acquisition
Alexandru Gagniuc [Sun, 23 Dec 2012 18:48:48 +0000 (12:48 -0600)]
serial-dmm: Handle time-limited acquisition

Implement SR_HWCAP_LIMIT_MSEC capability, to allow acquisition to automatically
stop after a specified amount of time.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agors9lcd: Fix segfault with unusual modes.
Alexandru Gagniuc [Tue, 25 Dec 2012 22:21:24 +0000 (16:21 -0600)]
rs9lcd: Fix segfault with unusual modes.

Some unusual modes required re-parsing the value. Instead of assigning the
re-parsed value to *floatval, it was reassigned directly to *analog->data;
however, analog->data is not initialized at this point, causing a segfault.
This situation was created when moving the radioshack-dmm code to serial-dmm,
with the segfault not being observed at that time.

Do not write directly to analog->data, but instead use the intermediate
variable rawval.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agors9lcd: Convenience fixes
Alexandru Gagniuc [Tue, 25 Dec 2012 21:40:30 +0000 (15:40 -0600)]
rs9lcd: Convenience fixes

Convert bit masks from hardcoded hex values to bit shifts. For example 0x80
becomes (1 << 7). This also fixes a typo error in the definition of INFO_DIODE.

Add comments explaining that some case values in sr_rs9lcd_parse() are meant to
fall through without a 'break;', and explain some of the unusual modes.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoadded Nexus-Computing OsciPrime VID:PID
Bert Vermeulen [Tue, 25 Dec 2012 18:13:20 +0000 (19:13 +0100)]
added Nexus-Computing OsciPrime VID:PID

11 years agonexus-osciprime: basic scanning functionality
Bert Vermeulen [Tue, 25 Dec 2012 18:09:12 +0000 (19:09 +0100)]
nexus-osciprime: basic scanning functionality

Unfortunately the device doesn't have an EEPROM on board at all, and so
initially enumerates with the default Cypress FX2 VID:PID (04b4:8613).
Since we already support using plain FX2* as basic logic analyzers using
the fx2lafw firmware, we cannot support that same VID:PID for the
OsciPrime. Therefore a USB conn is required for the initial scan.

However, once the firmware is uploaded the device re-enumerates as
04b4:1004, which we do detect for scanning automatically.

Thus, the OsciPrime driver requires one scan with conn parameter to get
the firmware uploaded, but it will then keep working until powered off.

11 years agonexus-osciprime: Initial driver skeleton.
Bert Vermeulen [Mon, 24 Dec 2012 19:11:38 +0000 (20:11 +0100)]
nexus-osciprime: Initial driver skeleton.

11 years agofluke-dmm: Properly handle continuous mode
Bert Vermeulen [Mon, 24 Dec 2012 19:27:45 +0000 (20:27 +0100)]
fluke-dmm: Properly handle continuous mode

Same bug+fix as commit d55c89f523e74a2f629bb23e8fd9bf6db7e3758a

11 years agosession.c: Remove all remaining sources on sr_session_stop
Alexandru Gagniuc [Wed, 19 Dec 2012 10:15:18 +0000 (04:15 -0600)]
session.c: Remove all remaining sources on sr_session_stop

Some sources may not be necessarily associated with a device. The best example
is the anykey pollfd from sigrok-cli. sr_session_stop only removes sources
associated with hardware devices via dev_acquisition_stop. Sources such as
anykey are not removed, and thus session->num_sources will not get to 0. As a
result, we may get into situations where the event loop enters an infinite
state.

To prevent this, all we have to do is remove any active sources that are still
present after dev_acquisition_stop has been called for all devices.

This fixes bug 14.

11 years agoasix-sigma: Quickfix for an ASIX SIGMA issue.
Uwe Hermann [Mon, 24 Dec 2012 15:57:55 +0000 (16:57 +0100)]
asix-sigma: Quickfix for an ASIX SIGMA issue.

It's not entirely clear whether this is the right fix, but we're merging
it for now, pending later review.

See also: http://sigrok.org/bugzilla/show_bug.cgi?id=26

11 years agofx2lafw: Tidied probe_names
Joel Holdsworth [Tue, 11 Dec 2012 20:51:53 +0000 (20:51 +0000)]
fx2lafw: Tidied probe_names

11 years agools: Split into api.c and protocol.[ch].
Uwe Hermann [Sun, 23 Dec 2012 19:41:27 +0000 (20:41 +0100)]
ols: Split into api.c and protocol.[ch].

Also, drop various no longer needed #include files.

11 years agools: Use logging helper macro.
Uwe Hermann [Sun, 23 Dec 2012 18:09:11 +0000 (19:09 +0100)]
ols: Use logging helper macro.

11 years agofluke-dmm: 190 series scopemeter support
Bert Vermeulen [Mon, 24 Dec 2012 10:00:55 +0000 (11:00 +0100)]
fluke-dmm: 190 series scopemeter support

199B only for now.

11 years agofluke-dmm: parser cleanup
Bert Vermeulen [Mon, 24 Dec 2012 09:59:41 +0000 (10:59 +0100)]
fluke-dmm: parser cleanup

11 years agofluke-dmm: adapt scanner to accomodate 190 series scopemeters
Bert Vermeulen [Mon, 24 Dec 2012 09:56:54 +0000 (10:56 +0100)]
fluke-dmm: adapt scanner to accomodate 190 series scopemeters

11 years agofluke-dmm: make poll timeout configurable
Bert Vermeulen [Mon, 24 Dec 2012 09:40:04 +0000 (10:40 +0100)]
fluke-dmm: make poll timeout configurable

Defaulted to 1s before, but a simple "QM" command on a 199B in scope
mode takes 1.7s to come through.

11 years agoserial: more debug cleanup
Bert Vermeulen [Sun, 23 Dec 2012 17:54:24 +0000 (18:54 +0100)]
serial: more debug cleanup

11 years agoserial: get rid of overly verbose spew
Bert Vermeulen [Thu, 20 Dec 2012 09:41:48 +0000 (10:41 +0100)]
serial: get rid of overly verbose spew

It just made spew-level logging unusable; the way sigrok async comms work
guarantees most of it was a false error.

11 years agoalsa: Split into api.c and protocol.c
Alexandru Gagniuc [Thu, 20 Dec 2012 17:33:49 +0000 (11:33 -0600)]
alsa: Split into api.c and protocol.c

This is the driver model agreed upon for all drivers.

As a result of the split, a devc->num_probes field had to be added in order to
reduce the interdependence between api.c and protocol.c .

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agodevice.c: Fix memory leak in sr_serial_dev_inst_free
Alexandru Gagniuc [Thu, 20 Dec 2012 03:39:38 +0000 (21:39 -0600)]
device.c: Fix memory leak in sr_serial_dev_inst_free

sr_serial_dev_inst_free() freed all members of sr_serial_dev_inst, but did not
free the struct itself, as expected from a free_*() function. This inadvertently
caused a memory leak in every place sr_serial_dev_inst is used.

Free the struct itself

+ g_free(serial);

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoserial-dmm: Properly handle continuous mode
Alexandru Gagniuc [Sat, 22 Dec 2012 22:00:44 +0000 (16:00 -0600)]
serial-dmm: Properly handle continuous mode

serial-dmm does not check if a sample limit is actually in place before deciding
to stop acquisition. Since the sample limit is set at 0 by default, operating
in continuous mode will cause acquisition to stop before even sending the first
sample.

Check to make sure we actually are in a sample-limited mode before stopping for
this reason.

Signed-off-by: Alexandru Gagniuc <redacted>
11 years agoconfigure.ac: Improve check for libusb-1.0.
Uwe Hermann [Sat, 22 Dec 2012 00:33:03 +0000 (01:33 +0100)]
configure.ac: Improve check for libusb-1.0.

PKG_CHECK_MODULES() checks for libusb-1.0 via pkg-config already, no
need to use a "manual" additional check via AC_CHECK_LIB() just to set
HAVE_LIBUSB_1_0 in config.h.

This helps with cross-compiling setups, among other things.