]>
sigrok.org Git - libsigrok.git/log
poljar (Damir Jelić) [Sat, 9 Nov 2013 11:49:08 +0000 (12:49 +0100)]
scpi: Add a function to read and wait on a *OPC? reply.
The SCPI standard specifies the "*OPC?" command (Operation complete query) which
queries the instrument for its operative state. When all pending operations are
complete, the instrument responds with a "1".
Some manufacturers block before completing all operations and don't respond
with anything and some of them respond with a "0". This function handles both
cases uniformly.
poljar (Damir Jelić) [Fri, 1 Nov 2013 18:27:44 +0000 (19:27 +0100)]
scpi: Add more functions (getting int/bool/float/double).
This patch adds helper functions to read an SCPI response and parse the response
as an integer, boolean, floating-point or double-precision floating-point number.
poljar (Damir Jelić) [Fri, 1 Nov 2013 18:25:32 +0000 (19:25 +0100)]
scpi: Add function to strictly parse bool strings.
This patch adds a function that is similar to sr_parse_boolstring but its
matching rules are more strict.
poljar (Damir Jelić) [Tue, 29 Oct 2013 11:15:47 +0000 (12:15 +0100)]
scpi: Add helper functions for SCPI communication.
The Standard Commands for Programmable Instruments (SCPI) defines a standard
for syntax and commands to use in controlling programmable test and measurement
devices.
SCPI documentation:
http://www.ivifoundation.org/docs/scpi-99.pdf
This patch adds helper functions for sending SCPI commands, reading a SCPI
response and reading and parsing a SCPI "*IDN?" response.
poljar (Damir Jelić) [Fri, 1 Nov 2013 17:40:06 +0000 (18:40 +0100)]
strutil: Add helper functions: string to number.
This patch adds helper functions for converting a string to different number
formats (double, long, float, int).
These functions are exposed in the public API.
Dan Horák [Sun, 1 Dec 2013 21:07:18 +0000 (22:07 +0100)]
define correct variable for the unified Rigol driver
Uwe Hermann [Sun, 1 Dec 2013 18:30:35 +0000 (19:30 +0100)]
serial-dmm: No error message upon 0 new bytes.
Martin Ling [Wed, 27 Nov 2013 01:43:49 +0000 (01:43 +0000)]
Use new libserialport blocking/nonblocking API calls.
Bert Vermeulen [Fri, 29 Nov 2013 16:32:55 +0000 (17:32 +0100)]
Fix memory leak when loading session files.
Martin Ling [Fri, 29 Nov 2013 01:40:50 +0000 (01:40 +0000)]
rigol-ds: Fix duplicated "LA" probe group.
Martin Ling [Fri, 29 Nov 2013 00:48:42 +0000 (00:48 +0000)]
Create & use new sr_usbtmc_dev_inst for Rigol DS driver.
Martin Ling [Fri, 29 Nov 2013 00:14:54 +0000 (00:14 +0000)]
DS2000 sample memory capture patches from Mathias Grimmberger.
Martin Ling [Thu, 7 Nov 2013 23:13:30 +0000 (23:13 +0000)]
Fix handling second channel on DS2000 series.
Patch from Mathias Grimmberger.
Martin Ling [Fri, 1 Nov 2013 21:49:05 +0000 (21:49 +0000)]
rigol-ds: brown paper bag, using timebases instead of vdivs.
Martin Ling [Fri, 1 Nov 2013 21:32:33 +0000 (21:32 +0000)]
rigol-ds: fix calls to config_list with NULL sdi/devc.
Martin Ling [Fri, 1 Nov 2013 11:05:49 +0000 (11:05 +0000)]
rigol-ds: Add support for DS2xx2 series.
Based on patch by Mathias Grimmberger <redacted>.
Martin Ling [Thu, 31 Oct 2013 17:31:39 +0000 (17:31 +0000)]
Rename rigol-ds1xx2 driver to rigol-ds.
Bert Vermeulen [Tue, 26 Nov 2013 21:20:30 +0000 (22:20 +0100)]
Don't accept over 64 probes.
The code is limited to 64 probes for now, so don't accept setting
the probe limit to higher than that.
See bug 194.
Bert Vermeulen [Tue, 26 Nov 2013 21:11:48 +0000 (22:11 +0100)]
input/vcd: Coding style fixes.
Bert Vermeulen [Tue, 26 Nov 2013 15:59:04 +0000 (16:59 +0100)]
output/csv: Fix wrong cast.
Uwe Hermann [Tue, 26 Nov 2013 15:29:43 +0000 (16:29 +0100)]
serial.c: Re-enable serial_read() error reporting.
libserialport now returns 0 (not SP_ERR_FAIL) as return value when a
non-blocking read would return EAGAIN.
This fixes bug #188.
Martin Ling [Sat, 23 Nov 2013 21:00:28 +0000 (21:00 +0000)]
Use new libserialport opaque configuration structure.
Martin Ling [Sat, 23 Nov 2013 20:48:15 +0000 (20:48 +0000)]
Use accessor for new libserialport opaque port structure.
Bert Vermeulen [Tue, 26 Nov 2013 00:50:21 +0000 (01:50 +0100)]
gmc-mh-1x-2x driver depends on libserialport
Bert Vermeulen [Sat, 23 Nov 2013 14:24:40 +0000 (15:24 +0100)]
uni-t-dmm: Drop unnecessary DMM count.
Bert Vermeulen [Sat, 23 Nov 2013 11:50:33 +0000 (12:50 +0100)]
uni-t-dmm: Add support for the Tenma 72-7745.
This is a rebadged UNI-T UT60E.
Uwe Hermann [Fri, 22 Nov 2013 19:03:03 +0000 (20:03 +0100)]
hantek-dso: config_list(): Only SR_CONF_BUFFERSIZE needs sdi.
Uwe Hermann [Fri, 22 Nov 2013 18:56:20 +0000 (19:56 +0100)]
ols: config_list(): Handle SR_CONF_PATTERN_MODE.
SR_CONF_PATTERN_MODE was not handled in config_list(), yielding
non-working OLS support in PulseView (due to an assert), and a missing
pattern list in sigrok-cli's --show output.
This fixes bug #184.
Uwe Hermann [Fri, 22 Nov 2013 14:13:04 +0000 (15:13 +0100)]
Update to 3-digit libserialport package version format.
Uwe Hermann [Fri, 22 Nov 2013 14:02:12 +0000 (15:02 +0100)]
Make struct sr_session opaque.
The fields of this structure should not be used directly by frontends
(and none of the current ones do). Thus, make the struct opaque and hide
its contents from the API.
Matthias Heidbrink [Thu, 21 Nov 2013 14:47:09 +0000 (15:47 +0100)]
gmc_mh_1x_2x: Completed driver for Metrahit 1x/2x
This driver supports devices with “RS232“ interface (Metrahit 16I,
18S, Siemens B1105 tested, 29S incomplete).
Matthias Heidbrink [Tue, 19 Nov 2013 21:30:34 +0000 (22:30 +0100)]
Added SR_MQ_TIME and SR_MQFLAG_DURATION.
Matthias Heidbrink [Tue, 19 Nov 2013 21:26:53 +0000 (22:26 +0100)]
serial: Allow 5 and 6 data bits.
Matthias Heidbrink [Tue, 19 Nov 2013 16:49:23 +0000 (17:49 +0100)]
gmc_mh_1x_2x: Inital driver skeleton.
Martin Ling [Thu, 21 Nov 2013 17:33:02 +0000 (17:33 +0000)]
Update for libserialport v0.1 API.
Bert Vermeulen [Wed, 20 Nov 2013 21:06:01 +0000 (22:06 +0100)]
Suppress compile warning
poljar (Damir Jelić) [Tue, 19 Nov 2013 11:03:20 +0000 (12:03 +0100)]
output/text: Fix memory leak of internal state buffers.
The text output module keeps buffers for internal state, upon receiving a DF_END
packet it frees the internal context but the buffers are never freed.
This adds a text_cleanup() helper function and registers it as the cleanup
function within all the text output modules.
Uwe Hermann [Tue, 19 Nov 2013 23:42:08 +0000 (00:42 +0100)]
DT4000ZC/TP4000ZC: Force DTR=1 on the serial port.
This fixes the driver e.g. on NetBSD.
Uwe Hermann [Tue, 19 Nov 2013 22:22:46 +0000 (23:22 +0100)]
ols: Always open serial port in nonblocking mode.
The scan() function was opening the port in non-blocking mode, the dev_open()
function however was not using the SERIAL_NONBLOCK flag. This led to hangs
in certain situations.
This fixes the OLS e.g. on NetBSD.
Uwe Hermann [Tue, 19 Nov 2013 19:09:59 +0000 (20:09 +0100)]
serial.c: Minor cosmetic fix.
Martin Ling [Fri, 15 Nov 2013 00:26:45 +0000 (00:26 +0000)]
Use new sp_port_config fields.
Martin Ling [Thu, 14 Nov 2013 18:52:57 +0000 (18:52 +0000)]
serial: Use new sp_set_config instead of sp_set_params.
poljar (Damir Jelić) [Tue, 19 Nov 2013 00:08:19 +0000 (01:08 +0100)]
serial: Fix leak in serial_open.
A new sp_port is created every time we call serial_open (sp_get_port_by_name
implicitly creates one for us), so free it every time we call serial_close.
poljar (Damir Jelić) [Tue, 19 Nov 2013 00:08:18 +0000 (01:08 +0100)]
device: Fix leak if probe groups are created.
poljar (Damir Jelić) [Fri, 15 Nov 2013 15:54:55 +0000 (16:54 +0100)]
rigol-ds1xx2: Send a SR_DF_END packet before acquisition stop.
Without a SR_DF_END samples could be cached in the internal buffer of an output
module and never flushed, therefore they would be missing in the final output.
By sending a SR_DF_END packet we force the output to be flushed.
Uwe Hermann [Fri, 15 Nov 2013 11:23:09 +0000 (12:23 +0100)]
serial.c: Temporary quickfix until a libserialport fix is done.
Uwe Hermann [Fri, 15 Nov 2013 08:48:34 +0000 (09:48 +0100)]
libsigrok-internal.h: Fix libserialport.h name.
Uwe Hermann [Wed, 13 Nov 2013 21:43:26 +0000 (22:43 +0100)]
uni-t-dmm: Drop unused packet_request callback.
Uwe Hermann [Wed, 13 Nov 2013 18:56:13 +0000 (19:56 +0100)]
configure.ac: libserialport is optional.
Disable drivers that need serial port support if libserialport is not found.
Also, disable building various other serial port related code in that case.
Uwe Hermann [Wed, 13 Nov 2013 18:35:27 +0000 (19:35 +0100)]
README: Document new libserialport requirement.
Uwe Hermann [Wed, 13 Nov 2013 18:09:46 +0000 (19:09 +0100)]
serial.c: Fix a few return values.
Uwe Hermann [Wed, 13 Nov 2013 18:04:54 +0000 (19:04 +0100)]
serial.c: Cosmetics, coding-style.
Martin Ling [Mon, 4 Nov 2013 12:54:27 +0000 (12:54 +0000)]
Update for renamed libserialport header file.
Martin Ling [Sun, 3 Nov 2013 23:10:17 +0000 (23:10 +0000)]
Fix silly copy-paste error.
Martin Ling [Sun, 3 Nov 2013 22:53:04 +0000 (22:53 +0000)]
Update to new libserialport API.
Martin Ling [Sun, 27 Oct 2013 15:51:24 +0000 (15:51 +0000)]
Use libserialport for serial port access.
Uwe Hermann [Mon, 11 Nov 2013 06:53:52 +0000 (07:53 +0100)]
error.c: Add SR_ERR_PROBE_GROUP handling.
Uwe Hermann [Mon, 11 Nov 2013 06:42:51 +0000 (07:42 +0100)]
doxygen: Fix/improve 'struct sr_probe_group' documentation.
Uwe Hermann [Sun, 10 Nov 2013 22:22:18 +0000 (23:22 +0100)]
unittests: Update for probe-groups changes.
Bert Vermeulen [Sun, 3 Nov 2013 13:16:10 +0000 (14:16 +0100)]
rigol-ds1xx2: Unbreak listing of _VDIV and _COUPLING
Bert Vermeulen [Sun, 3 Nov 2013 13:15:35 +0000 (14:15 +0100)]
rigol-ds1xx2: Unbreak listing of SR_CONF_DEVICE_OPTIONS
Bert Vermeulen [Sun, 3 Nov 2013 13:13:59 +0000 (14:13 +0100)]
rigol-ds1xx2: Better error reporting when probe groups are required
Bert Vermeulen [Sun, 3 Nov 2013 13:11:43 +0000 (14:11 +0100)]
rigol-ds1xx2: Minor coding style fixes
Bert Vermeulen [Sun, 3 Nov 2013 13:04:15 +0000 (14:04 +0100)]
Add SR_ERR_PROBE_GROUP, denoting a probe group requirement
Bert Vermeulen [Thu, 31 Oct 2013 22:58:33 +0000 (23:58 +0100)]
probe_groups: API changes required to implement probe groups.
Bert Vermeulen [Thu, 31 Oct 2013 21:53:22 +0000 (22:53 +0100)]
rigol-ds1xx2: fix bitrot in device cleanup code
Bert Vermeulen [Sun, 28 Apr 2013 20:11:43 +0000 (22:11 +0200)]
rigol-ds1xx2: Don't assume valid sdi
Bert Vermeulen [Sun, 28 Apr 2013 20:11:05 +0000 (22:11 +0200)]
Update API documentation
Bert Vermeulen [Sun, 28 Apr 2013 11:05:27 +0000 (13:05 +0200)]
rigol-ds1xx2: Skip obsolete fields
Martin Ling [Sun, 21 Apr 2013 15:02:12 +0000 (16:02 +0100)]
python: Map probe group configuration to ProbeGroup attributes.
Martin Ling [Sun, 21 Apr 2013 14:46:48 +0000 (15:46 +0100)]
python: Add classes for probes and probe groups.
Martin Ling [Sun, 21 Apr 2013 13:48:56 +0000 (14:48 +0100)]
rigol-ds1xx2: implement probe group specific options.
Martin Ling [Sun, 21 Apr 2013 12:44:34 +0000 (13:44 +0100)]
rigol-ds1xx2: create probe groups.
Martin Ling [Sun, 21 Apr 2013 20:07:16 +0000 (21:07 +0100)]
probe_groups: Add a name field to sr_probe_group.
Martin Ling [Sun, 21 Apr 2013 20:05:03 +0000 (21:05 +0100)]
probe_groups: initialise sdi->probe_groups to NULL.
Martin Ling [Sun, 21 Apr 2013 20:11:32 +0000 (21:11 +0100)]
probe_groups: Update Python bindings for API change.
Bert Vermeulen [Sat, 20 Apr 2013 22:45:01 +0000 (00:45 +0200)]
Use priv for consistency
Martin Ling [Sat, 20 Apr 2013 00:00:49 +0000 (01:00 +0100)]
probe_groups: API changes required to implement probe groups.
Dan Horák [Mon, 4 Nov 2013 09:53:36 +0000 (10:53 +0100)]
update udev rules
With usbtmc driver being classified under usbmisc in newer kernels the udev rules
need an update.
Uwe Hermann [Sun, 3 Nov 2013 22:34:21 +0000 (23:34 +0100)]
configure.ac: Bump libtool/library version from 1:1:0 to 1:2:0.
The libtool current:revision:age numbers change from 1:1:0 to 1:2:0
(i.e., revision is increased) since the library source code has changed,
but no interfaces were added or changed or removed.
Details:
http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
This changes the library filename (e.g. on Linux) from libsigrok.so.1.0.1
to libsigrok.so.1.0.2, but the SONAME (+symlink) remains the same
(libsigrok.so.1) since this release is API- and ABI-compatible with the last.
Uwe Hermann [Sun, 3 Nov 2013 22:32:23 +0000 (23:32 +0100)]
configure.ac: Bump package version to 0.2.2.
Uwe Hermann [Sun, 3 Nov 2013 18:23:00 +0000 (19:23 +0100)]
NEWS: Update for upcoming 0.2.2 release.
Uwe Hermann [Sun, 3 Nov 2013 23:18:47 +0000 (00:18 +0100)]
output/analog: SR_UNIT_REVOLUTIONS_PER_MINUTE: Add missing break.
Uwe Hermann [Sun, 3 Nov 2013 23:46:45 +0000 (00:46 +0100)]
contrib/z60_libsigrok.rules: Also mention UNI-T UT325.
The same USB/HID based IC is used in the UNI-T UT-D04 cable (for various
multimeters) and the UNI-T UT325 thermometer.
Uwe Hermann [Sun, 3 Nov 2013 23:41:56 +0000 (00:41 +0100)]
contrib/z60_libsigrok.rules: Add entry for the Saleae Logic16.
Uwe Hermann [Sun, 3 Nov 2013 22:28:55 +0000 (23:28 +0100)]
configure.ac: Fix list sorting (cosmetic).
Uwe Hermann [Sun, 3 Nov 2013 22:28:03 +0000 (23:28 +0100)]
configure.ac: Move a teleinfo snippet to the correct place.
This breaks some configure use-cases otherwise.
Uwe Hermann [Sun, 3 Nov 2013 17:18:44 +0000 (18:18 +0100)]
README.devices: uni-t-dmm devices need VID/PID now.
Uwe Hermann [Sun, 3 Nov 2013 16:30:42 +0000 (17:30 +0100)]
README.devices: Updates.
Uwe Hermann [Sun, 3 Nov 2013 15:08:38 +0000 (16:08 +0100)]
doxygen: @since tags document only last API change.
If a function existed before but the API changed, the @since
tag only reflects the release of the last API change.
Uwe Hermann [Sun, 3 Nov 2013 15:06:15 +0000 (16:06 +0100)]
HACKING: Updates, some additions.
Dan Horák [Sat, 2 Nov 2013 15:47:11 +0000 (16:47 +0100)]
rigol-ds1xx2: detect Rigol DS1xx2 with upgraded bandwith
The bandwith in Rigol DS1xx2D/E scopes can be upgraded to 150 MHz in software.
So detect also scopes with the upgraded bandwith.
using libsigrok-0.2.1 + this change + commit
da970d24ec (required for newer kernels):
[dan@eagle sigrok]$ sigrok-cli --scan -d rigol-ds1xx2 -l 5
sr: libsigrok loglevel set to 5.
sr: Sanity-checking all drivers.
sr: Sanity-checking all input modules.
sr: Sanity-checking all output modules.
srd: libsigrokdecode loglevel set to 5.
sr: hwdriver: Initializing driver 'rigol-ds1xx2'.
sr: serial: Opening serial port '/dev/usbtmc0' (flags 1).
sr: serial: Opened serial port '/dev/usbtmc0' (fd 7).
sr: serial: Wrote 5/5 bytes (fd 7).
sr: serial: Closing serial port /dev/usbtmc0 (fd 7).
sr: rigol-ds1xx2: response: /dev/usbtmc0 [Rigol Technologies,DS1152D,DS1EU150XXXXXX,00.04.01.00.02]
sr: hwdriver: Scan of 'rigol-ds1xx2' found 1 devices.
The following devices were found:
rigol-ds1xx2 - Rigol Technologies DS1152D 00.04.01.00.02 with 18 probes: CH1 CH2 D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 D10 D11 D12 D13 D14 D15
Uwe Hermann [Thu, 31 Oct 2013 12:47:30 +0000 (13:47 +0100)]
metex14: Handle a few missing cases for overflow.
Uwe Hermann [Tue, 29 Oct 2013 19:31:24 +0000 (20:31 +0100)]
Add support for the Metex M-4650CR.
(the Voltcraft M-4650CR is a rebadged Metex M-4650CR)
Uwe Hermann [Tue, 29 Oct 2013 17:10:10 +0000 (18:10 +0100)]
Add support for the Voltcraft M-4650CR.
Marc Schink [Wed, 23 Oct 2013 08:13:53 +0000 (10:13 +0200)]
Initial Comma-separated values (CSV) input support.
Uwe Hermann [Mon, 28 Oct 2013 21:59:32 +0000 (22:59 +0100)]
Fix two FreeBSD build issues related to libusb-1.0.
FreeBSD's libusb-1.0 compatible library has a few differences compared
to the "normal" libusb-1.0 from libusb.org which we have to work around.
LIBUSB_CLASS_APPLICATION doesn't exist in FreeBSD's libusb, and
libusb_handle_events_timeout_completed() doesn't exist either.
The latter is basically libusb_handle_events_timeout() with an extra
(unused by us) parameter, so the workaround is relatively simple.
This fixes bug #185.
Uwe Hermann [Wed, 13 Mar 2013 08:46:08 +0000 (09:46 +0100)]
Unit tests for 'binary' input format & version APIs.
Uwe Hermann [Fri, 25 Oct 2013 18:10:01 +0000 (20:10 +0200)]
norma-dmm: Minor cosmetics, coding-style, consistency fixes.
Also, add a missing "%" in an sr_err() and a missing parameter in
another sr_err().
Matthias Heidbrink [Thu, 17 Oct 2013 08:57:18 +0000 (10:57 +0200)]
norma dmm: Implemented driver.