Martin Ling
fe0d9caa88
rigol-ds: Fix a couple of compile warnings.
2014-01-23 23:12:37 +01:00
Bert Vermeulen
e36aae989c
output/csv: Drop last separators as needed.
2014-01-23 23:11:34 +01:00
Daniel Elstner
ee38c8ba3e
sysclk-lwla: Implement config_commit() callback.
...
Move pre-acquisition hardware setup to the new config_commit()
callback. At the moment, the only setting applied at commit
time is switching the clock source, which involves uploading
a new bitstream to the FPGA.
2014-01-23 02:43:16 +01:00
Daniel Elstner
43db343618
sysclk-lwla: Implement config_probe_set() callback.
...
Move setup of channels and trigger masks to the new probe
configuration callback. Although the actual hardware setup
still happens just before acquisition, the new approach
already has the advantage that invalid settings are caught
early.
Also, it turns out that the LWLA1034 allows triggering on
channels which are not enabled for data acquisition. This
feature is now supported as well.
2014-01-23 02:36:13 +01:00
Daniel Elstner
50cad98d1b
sysclk-lwla: Do not reset drv_context.instances on scan.
...
Apparently, frontends may call scan() more than once to accumulate
multiple devices, so do not reset the instance list pointer at the
start of each scan. Also, number devices continuously across scans.
2014-01-23 02:36:13 +01:00
Daniel Elstner
99c76642aa
sysclk-lwla: Advertise SR_CONF_CONN option.
2014-01-23 02:36:13 +01:00
Martin Ling
4472867a9f
rigol-ds: Don't run rigol_ds_block_wait() code unless supported.
2014-01-23 01:42:34 +01:00
Martin Ling
aff00e4088
rigol-ds: Fix partial read handling in header parser.
2014-01-23 01:42:34 +01:00
Martin Ling
8943049cd4
scpi_serial: Reimplement to allow scpi_read_complete() to work correctly.
2014-01-23 01:42:34 +01:00
Martin Ling
824eb2acfd
rigol-ds: Fix divide by zero when no analog probes selected.
2014-01-23 01:42:34 +01:00
Martin Ling
7d63347e90
rigol-ds: Stop capture cleanly on read errors.
2014-01-23 01:42:33 +01:00
Martin Ling
ae3a191366
rigol-ds: Improve protocol debugging output, abort on read errors.
2014-01-23 01:42:33 +01:00
Martin Ling
2b399703d1
rigol-ds: Only protocol v3 adds trailing linefeeds to data blocks.
2014-01-23 01:42:33 +01:00
Martin Ling
a849c43a50
scpi_usbtmc: Improve debugging output.
2014-01-23 01:42:33 +01:00
Martin Ling
569d4dbd3e
rigol-ds: Overhaul vendor/series/model info and protocol variants.
2014-01-23 01:42:33 +01:00
Martin Ling
e086b750fa
rigol-ds: Overhaul VS5000 and DS1000 support.
...
This change moves the handling of series differences out to the points in the
code where they actually matter, unifying the overall structure of the code.
It also adds new VS5000/DS1000 series equivalents for commands that were
previously only implemented on the later models.
After this change, trigger waiting and the 'Memory' data source are supported
on the VS5000/DS1000 series.
2014-01-23 01:42:33 +01:00
Martin Ling
38354d9d9e
rigol-ds: Use common rigol_ds_config_set() function throughout.
2014-01-23 01:42:33 +01:00
Martin Ling
cf9f4bc5b0
scpi: Log responses received by sr_scpi_get_string().
2014-01-23 01:42:33 +01:00
Bert Vermeulen
32f09bfd9e
ols: Don't reduce sample count just because it's not a multiple of 4.
2014-01-23 01:09:16 +01:00
Bert Vermeulen
54da58ca9b
output/csv: Drop extra separator on every line.
2014-01-22 02:44:52 +01:00
Bert Vermeulen
e96cf218c0
output/csv: Get rid of 64-probe limit.
2014-01-22 02:34:56 +01:00
Bert Vermeulen
4829d37d6a
output/csv: Use new output API.
2014-01-22 01:14:26 +01:00
Bert Vermeulen
2b36d6c64e
demo: Cycle through all available patterns for default analog probes.
2014-01-21 18:25:50 +01:00
Bert Vermeulen
03aa381efb
demo: Probe indexes should be unique, even if the types are different.
2014-01-21 18:19:57 +01:00
Bert Vermeulen
eca2f85213
Don't mention non-logic probes in session file metadata.
...
They don't get saved anyway, and are very confusing to clients.
2014-01-21 18:16:52 +01:00
Martin Ling
22c196883d
rigol-ds: Disable key lock when closing device.
2014-01-21 17:52:23 +01:00
Bert Vermeulen
933e63a13b
brymen-dmm: Make protocol parser locale-independent.
2014-01-21 17:02:27 +01:00
Bert Vermeulen
fe9d5abefc
agilent-dmm: Make protocol parser locale-independent.
2014-01-21 16:43:49 +01:00
Bert Vermeulen
357e341d9a
fluke-dmm: Make protocol parsers locale-independent.
2014-01-21 16:33:34 +01:00
Bert Vermeulen
d2cd06e7e9
Make sure to delete temporary metadata file after use.
...
Fixes bug 276.
2014-01-21 14:47:05 +01:00
Bert Vermeulen
ac2926b37b
std: Fix caller prefix output.
2014-01-21 14:03:27 +01:00
Martin Ling
10d309c8ab
rigol-ds: DS1000 series still needs the stupid delay.
2014-01-21 13:10:29 +01:00
Daniel Elstner
32b7cd4f02
session: Auto-commit settings before acquisition.
...
(sr_session_start): Just before starting acquisition on
a device, call sr_config_commit() to apply pending config
changes to the hardware device.
(sr_session_dev_add): Ditto. Also, return an error code
if starting acquisition failed.
2014-01-21 13:09:51 +01:00
Bert Vermeulen
8dd0b290eb
rigol-ds: On DS1000 with firmware < 0.2.4, use legacy protocol.
...
Apparently the ASCII header containing length was only added in version
0.2.4.
2014-01-21 13:05:06 +01:00
Bert Vermeulen
fcdebbe89c
rigol-ds: Shorten vendor name.
2014-01-20 19:08:10 +01:00
Bert Vermeulen
67d6f6fca2
agilent-dmm: Shorten vendor name.
2014-01-20 19:07:48 +01:00
Bert Vermeulen
6d16fdfb13
ols: Add option to turn test patterns off again.
2014-01-20 18:16:25 +01:00
Daniel Elstner
2a854d7139
hwdriver: Introduce sr_config_commit() API call.
...
(sr_dev_driver.config_probe_set): New optional callback enabling
drivers to be notified upon changes to probe settings.
(sr_dev_probe_enable, sr_dev_trigger_set): Invoke new driver
callback on changes.
(sr_dev_driver.config_commit): New optional callback allowing
drivers to defer application of configuration settings until
an explicit call to config_commit().
(sr_config_commit): New public wrapper function.
2014-01-20 14:16:32 +01:00
Aurelien Jacobs
2b0e4a468a
rigol-ds: add support for more keys in config_get()
2014-01-20 00:34:57 +00:00
Aurelien Jacobs
72ecba02f4
rigol-ds: use appropriately defined NUM_VDIV constant
2014-01-20 00:34:57 +00:00
Aurelien Jacobs
8e06edf528
rigol-ds: add more valid timebases for DS2302
2014-01-20 00:34:57 +00:00
Aurelien Jacobs
889ef4a01c
rigol-ds: fix set_cfg() calls with float parameters to avoid locale issues
2014-01-20 00:34:56 +00:00
Martin Ling
f76c24f6fd
rigol-ds: Send FRAME_BEGIN and FRAME_END per frame, not per channel.
2014-01-20 00:24:57 +00:00
Martin Ling
bac11aeb1b
rigol-ds: Cleanup and fix check for short data blocks.
2014-01-20 00:24:57 +00:00
Martin Ling
51bfe5363a
rigol-ds: Use *OPC? command rather than delay to await completion.
2014-01-20 00:24:57 +00:00
Martin Ling
7788579e66
scpi: Remove redundant newline removal in sr_scpi_get_hw_id().
2014-01-20 00:24:57 +00:00
Martin Ling
334fbc2ac0
rigol-ds: Use standard sr_scpi_get functions, remove internal versions.
2014-01-20 00:24:57 +00:00
Martin Ling
d03dfac6b9
scpi: Strip trailing newlines in sr_scpi_get_string().
2014-01-20 00:24:57 +00:00
Martin Ling
470140fc0d
rigol-ds: DS1000 series actually use IEEE488.2 data block format.
2014-01-20 00:24:57 +00:00
Martin Ling
d22250a96a
rigol-ds: Correct digital waveform block sizes.
2014-01-20 00:24:14 +00:00