Commit Graph

960 Commits

Author SHA1 Message Date
Joel Holdsworth e053204700 demo: Only one GIOChannel is needed 2013-04-14 23:39:15 +02:00
Joel Holdsworth bbd7ef0f18 demo: Fixed glitching in increment signal 2013-04-14 23:39:15 +02:00
Joel Holdsworth f0b6ae19a8 alsa: Set the probe index 2013-04-14 23:39:15 +02:00
Jan Luebbe 9e5670d0ab zeroplus-logic-cube: add USB ID for LAP-16128U 2013-04-14 17:06:57 +02:00
Martin Ling 6bb192bc05 rigol-ds1xx2: support digital channels. 2013-04-14 16:57:02 +02:00
Martin Ling a789b61087 rigol-ds1xx2: doesn't actually support SR_CONF_LIMIT_SAMPLES 2013-04-14 16:57:01 +02:00
Martin Ling ee7e9bee5d rigol-ds1xx2: fix handling of partial frames. 2013-04-14 16:57:01 +02:00
Bert Vermeulen 0c05591abf ols: Support get/set/list on all device options
Where it makes sense: _LOGIC_ANALYZER and _TRIGGER_TYPE don't have much
use for all of them.
2013-04-14 00:36:05 +02:00
Bert Vermeulen 8f35be72b4 rigol-ds1xx2: Use g_usleep() for portability 2013-04-12 19:42:44 +02:00
Uwe Hermann 169dbe8577 rigol-ds1xx2: Whitespace, minor fix.
Return SR_ERR_MALLOC for failed malloc, not SR_ERR.
2013-04-12 18:44:28 +02:00
Uwe Hermann ff08a52a0f Fix two minor compiler warnings. 2013-04-12 17:45:01 +02:00
Bert Vermeulen 254dd102e8 rigol-ds1xx2: Support for all channels, proper defaults
Since this driver supports devices with a control panel and display,
we take the defaults from the device -- not a set of sensible
defaults as usual.
2013-04-11 18:32:08 +02:00
Bert Vermeulen 88e429c97f rigol-ds1xx2: fix channel numbers
Copyright bump, too.
2013-04-11 18:32:08 +02:00
Bert Vermeulen a3df166f02 rigol-ds1xx2: better debugging 2013-04-11 18:32:08 +02:00
Bert Vermeulen 75d8a4e576 rigol-ds1xx2: properly send frame begin/end packets 2013-04-11 18:32:08 +02:00
Bert Vermeulen 7991784841 hantek-dso: Support SR_CONF_NUM_TIMEBASE/SR_CONF_NUM_VDIV 2013-04-11 18:32:08 +02:00
Bert Vermeulen d62d7ad151 rigol-ds1xx2: Support SR_CONF_NUM_TIMEBASE/SR_CONF_NUM_VDIV 2013-04-11 18:32:08 +02:00
Bert Vermeulen 861c447bfb rigol-ds1xx2: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples 2013-04-11 18:32:08 +02:00
Bert Vermeulen 3973ee26f5 hantek-dso: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples 2013-04-11 18:32:08 +02:00
Bert Vermeulen 034accb512 hantek-dso: move buffer sizes to device context
There are only two sizes for every device: 10k and the complete
per-channel buffer size. This can be doubled if one channel is disabled.
2013-04-11 18:32:08 +02:00
Bert Vermeulen fe9ac25250 ols: Get rid of gcc warnings 2013-04-11 18:32:08 +02:00
Bert Vermeulen 1bec72d2ac chronovu-la8: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen afdf6d6a20 tondaj-sl-814: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 7d93a62ea3 uni-t-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen ede25f4e6f serial-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen f6a0ac9f62 rigol-ds1xx2: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 2c2be40189 mic-985xx: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen a9ed6877f7 link-mso19: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 510b3e692a brymen-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 2c9c0df86e asix-sigma: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen aa0dbd683c alsa: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 3316e149d0 zeroplus-logic-cube: fix samplerate setting 2013-04-11 18:32:07 +02:00
Bert Vermeulen 8386096f01 zeroplus-logic-cube: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen c8733a2bbb nexus-osciprime: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen e44ac12a29 agilent-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen a59b4eef55 victor-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 70424328c1 fluke-dmm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen dccda194db colead-slm: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen 7faf69da10 lascar-el-usb: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:07 +02:00
Bert Vermeulen d40073113b hantek-dso: Small debug fix 2013-04-11 18:32:07 +02:00
Bert Vermeulen 86bb3f4a86 hantek-dso: deprecate struct sr_rational 2013-04-11 18:32:07 +02:00
Bert Vermeulen d00088ca6d demo: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:06 +02:00
Bert Vermeulen f627afd65b hantek-dso: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:06 +02:00
Bert Vermeulen aeea057220 ols: allow for disabling of RLE as well 2013-04-11 18:32:06 +02:00
Bert Vermeulen e46aa4f611 ols: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:06 +02:00
Bert Vermeulen d6836bf129 fx2lafw: Adjust to GVariant-based sr_config_* functions 2013-04-11 18:32:06 +02:00
Bert Vermeulen 13d8e03c4f Bump copyright year 2013-04-11 18:32:06 +02:00
Uwe Hermann 3fd1d0ee1c configure.ac: Improve USB/EZUSB/serial checks.
- If libusb-1.0 is not found, do not compile in ezusb.c and usb.c since
   they require libusb.h. The respective hardware drivers that use
   libusb-1.0, and usb.c and/or ezusb.c will be excluded from the build
   elsewhere in configure.ac. Rename NEED_EZUSB to NEED_USB.

 - Drop the NEED_SERIAL check and always compile in serial.c. This is a
   very small chunk of code, it does not depend on any external
   libraries that might be missing, and it compiles on all architectures.
   Thus there's no need to conditionally include or exclude it.
2013-04-09 17:49:13 +02:00
Bert Vermeulen 3f98bf7017 Fix kernel driver attached check
The check is really only broken on darwin, but useful on all other
platforms, even if only Linux can actually detach a driver.
2013-04-07 14:14:16 +02:00
Bert Vermeulen 8c971b6e5c hantek-dso: cosmetics 2013-04-07 14:01:03 +02:00
Bert Vermeulen 7b78b2f78f hantek-dso: use per-device firmware filenames 2013-04-02 14:20:29 +02:00
Uwe Hermann 3ebce226a2 s/sr_config_make/sr_config_new/.
This matches the naming of other/similar functions better.
2013-03-23 14:16:00 +01:00
Uwe Hermann 333bf022e3 rigol-ds1xx2: Use ARRAY_SIZE. 2013-03-23 14:14:58 +01:00
Alexandru Gagniuc 3864648bb6 serial-dmm: Add support for RadioShack 22-805
Protocol-wise, this is identical to the 22-168, except that it communicates at
600 baud instead of 1200 baud.
2013-03-20 20:36:56 -05:00
Uwe Hermann cc840ab618 serial.c: FreeBSD and OpenBSD don't have OFILL either. 2013-03-17 15:07:50 +01:00
Bert Vermeulen 8e77bc20b9 lascar-el-usb: push samplerate before data log 2013-03-16 21:52:02 +01:00
Bert Vermeulen 361d15110c lascar-el-usb: support for SR_CONF_DATALOG 2013-03-11 16:37:02 +01:00
Bert Vermeulen 9857276261 ols: use ptr to int dereference for SR_T_BOOL
This mad ptr to int casting has to go.
2013-03-11 16:37:02 +01:00
Bert Vermeulen 2474d87e8c demo: sync get/set options 2013-03-03 21:21:08 +01:00
lelazary 365f04d61f mso-19: Initial analog probe support (unfinished).
- Added the analog probe (unfinished).

 - Reset trigger to state to 0 before capture, just incase the scope is in
   the middle of a capture.
2013-03-03 17:59:06 +01:00
lelazary 5952553f56 mso-19: Fixed warning. 2013-03-03 17:58:46 +01:00
Uwe Hermann ff17e6ba50 mic985xx: Add missing memset(). 2013-02-11 18:23:17 +01:00
Uwe Hermann 6f3e5335ad mic-985xx: Add support for the MIC 98581.
This device only supports temperature measurements, no humidity.
2013-02-11 16:53:28 +01:00
Bert Vermeulen be6db330f8 hantek-dso: minor fixes 2013-02-10 17:06:56 +01:00
Bert Vermeulen 8421ffa44d asix-sigma: don't try to free static storage 2013-02-10 17:06:56 +01:00
Uwe Hermann cd2f0fe22c Add/use std_hw_dev_acquisition_stop_serial(). 2013-02-08 23:32:45 +01:00
Uwe Hermann 17548571cc zeroplus: Only report supported samplerates.
The currently supported model LAP-C(16032) doesn't support the
samplerates 150MHz and 200MHz which some of the other models have.

Thus, do not report these samplerates to the frontends. E.g. sigrok-cli
should not show them via --show and GUIs should not list them in their
"Samplerates" drop-down.
2013-02-08 23:19:50 +01:00
Uwe Hermann e495a676eb zeroplus: Cosmetics, small fixes, drop unneeded stuff. 2013-02-08 23:19:50 +01:00
Uwe Hermann 58c5f2ed17 zeroplus: Split into api.c and protocol.c. 2013-02-08 21:53:50 +01:00
Uwe Hermann 3e9b7f9c77 Rename session_dev_id to cb_data everywhere.
We use 'cb_data' in all drivers these days, make the few remaining ones
that use 'session_dev_id' consistent.
2013-02-07 11:26:02 +01:00
Uwe Hermann 6fab7b8f53 Driver struct cleanups.
- Explicitly list .config_get in all drivers for consistency, and set it
   to NULL if unused (whether or not a driver implements it is optional).

 - List all 'struct sr_dev_driver' entries in the same order in all drivers.

 - Move the check whether .config_set/.config_list exist (i.e., are non-NULL)
   into sanity_check_all_drivers().
2013-02-07 10:58:35 +01:00
Uwe Hermann 4afdfd4628 Add and use std_session_send_df_header().
This is a small helper function which sends the SR_DF_HEADER packet that
drivers usually emit in their hw_dev_acquisition_start() API callback.
It simplifies and shortens the hw_dev_acquisition_start() functions
quite a bit.

It also simplifies the input modules which send an SR_DF_HEADER packet, too.

This patch also automatically removes some unneeded malloc/free in some
drivers for the 'packet' and 'header' structs used for SR_DF_HEADER.
2013-02-07 10:46:28 +01:00
Uwe Hermann 961009b0c4 hw_dev_close(): Move common checks to wrapper.
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.
2013-02-05 18:46:33 +01:00
Uwe Hermann 0e94d524c1 Shorten/simplify hw_dev_list() implementations. 2013-02-05 18:27:05 +01:00
Uwe Hermann 7c8a9e1e0f serial-dmm: Drop unneeded g_try_malloc0(). 2013-02-02 12:34:25 +01:00
Uwe Hermann c5d6f5cc1c brymen-dmm: Cosmetics, coding-style, consistency.
Also, name the driver "brymen-bm857" in preparation to doing "subdrivers"
for other Brymen models later (similar to serial-dmm).
2013-02-02 12:07:45 +01:00
Uwe Hermann 943e94f567 brymen-dmm: Use std_hw_init(). 2013-02-02 11:19:27 +01:00
Alexandru Gagniuc 601fb67cc4 brymen-dmm: Add support for Brymen BM857
This patch might also work for a number of other Brymen models
-- 859(a), 867, 869---
including their respective rebadges from Greenlee, Extech, and Amprobe.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-02-02 11:19:27 +01:00
Alexandru Gagniuc 20cbc7854d brymen-dmm: Initial driver skeleton. 2013-02-02 11:19:27 +01:00
Uwe Hermann 0cd8e23140 Initial driver implementation for MIC 98583.
This is a USB/serial (Prolific) based temperature and humidity logger.
2013-02-02 11:13:45 +01:00
Uwe Hermann 7ec5b54955 mic-985xx: Initial driver skeleton. 2013-02-01 23:52:57 +01:00
Uwe Hermann 6d1161142d zeroplus: Use message logging helpers. 2013-02-01 00:24:40 +01:00
Uwe Hermann d3b38ad389 Drivers: Explicitly list sr_samplerates fields.
This makes it a bit easier to understand which value means what, just
from looking at the driver code.
2013-01-29 12:56:02 +01:00
Uwe Hermann 063e7aef6d Factor out common hw_init() driver code.
Most drivers do pretty much the same things in their hw_init()
right now, so factor out that code to std_hw_init() in std.c.
2013-01-29 12:56:02 +01:00
Uwe Hermann 4b97c74e0b sr_driver_scan(): Improve checks.
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.

Also, do some minor whitespace and consistency improvements.
2013-01-29 12:56:02 +01:00
Uwe Hermann c0eea11c45 sr_driver_init(): Improve checks.
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.

Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign
sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other
drivers do.
2013-01-29 12:56:02 +01:00
Uwe Hermann cbc6f3b253 hantek-dso: Use message logging helpers. 2013-01-29 12:56:02 +01:00
Uwe Hermann 7d4abe5a77 serial.c: NetBSD doesn't have OFILL. 2013-01-27 01:23:01 +01:00
Bert Vermeulen 6a4710fac2 drivers: Trim unused config_get() calls
None of the driver config_get/set/list calls are required.
2013-01-25 16:05:48 +01:00
Bert Vermeulen 0d485e30c6 Deprecate SR_DI_HWOPTS.
This is replaced by SR_CONF_SCAN_OPTIONS.
2013-01-25 15:09:20 +01:00
Bert Vermeulen 9a6517d14b Deprecate SR_DI_HWCAPS.
This is replaced by SR_CONF_DEVICE_OPTIONS.
2013-01-25 15:01:49 +01:00
Bert Vermeulen c50277a6ec Deprecate SR_DI_TRIGGER_TYPES.
This is replaced by SR_CONF_TRIGGER_TYPE.
2013-01-25 11:52:27 +01:00
Bert Vermeulen 328bafabd4 Deprecate SR_DI_TRIGGER_SOURCES.
This is replaced by SR_CONF_TRIGGER_SOURCE.
2013-01-25 11:25:32 +01:00
Bert Vermeulen 41f5bd09b0 Deprecate SR_DI_TIMEBASES.
This is replaced by SR_CONF_TIMEBASE.
2013-01-25 11:22:20 +01:00
Bert Vermeulen 6e1fbcc41b Deprecate SR_DI_FILTERS.
This is replaced by SR_CONF_FILTER.
2013-01-25 11:19:12 +01:00
Bert Vermeulen e4f2b2adc1 Deprecate SR_DI_VDIVS.
This is replaced by SR_CONF_VDIV.
2013-01-25 11:13:49 +01:00
Bert Vermeulen 2a7b113d13 Deprecate SR_DI_COUPLING.
This is replaced by SR_CONF_COUPLING.
2013-01-25 11:04:27 +01:00
Bert Vermeulen 6d1ceffa95 Deprecate SR_DI_BUFFERSIZES.
This is replaced by SR_CONF_BUFFERSIZE.
2013-01-25 10:58:37 +01:00
Bert Vermeulen dd96ea9879 Deprecate SR_DI_PATTERNS.
This is replaced by SR_CONF_PATTERN_MODE.
2013-01-25 03:38:44 +01:00
Bert Vermeulen 123e131383 Deprecate SR_DI_CUR_SAMPLERATE.
This is replaced by SR_CONF_SAMPLERATE.
2013-01-25 03:17:36 +01:00