Uwe Hermann
3f239f0803
Rename various *PROBE* macros to *CHANNEL*.
...
This fixes parts of bug #259 .
2014-03-25 20:58:54 +01:00
Uwe Hermann
ba7dd8bbb8
Replace 'probe' with 'channel' in most places.
...
Also, consistently use 'ch' for channel variables. This matches how we
consistently use sdi, devc, and so on all over the code-base.
This fixes parts of bug #259 .
2014-03-25 20:58:54 +01:00
Uwe Hermann
91aea754aa
Rename 'struct sr_probe' to 'struct sr_channel' everywhere.
...
This fixes parts of bug #259 .
2014-03-25 20:58:54 +01:00
Aurelien Jacobs
3918fbb0cf
rigol-ds: properly end WAIT_TRIGGER event handling
2014-02-07 18:53:04 +01:00
Martin Ling
fe0d9caa88
rigol-ds: Fix a couple of compile warnings.
2014-01-23 23:12:37 +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
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
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
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
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
334fbc2ac0
rigol-ds: Use standard sr_scpi_get functions, remove internal versions.
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
Martin Ling
3ed7a40c75
rigol-ds: Check SCPI read is complete after reading expected block length.
2014-01-20 00:24:14 +00:00
Uwe Hermann
c2b394d562
rigol-ds: Minor whitespace fixes.
2014-01-17 02:03:09 +01:00
Martin Ling
04e8e01ec6
rigol-ds: Enable/disable LA pod when (de)selecting digital channels.
2014-01-17 01:52:29 +01:00
Martin Ling
b751cf7a82
rigol-ds: Make sure to always send SR_DF_END at end of capture.
2014-01-17 01:52:29 +01:00
Martin Ling
bfaf112b68
rigol-ds: Use correct digital channel numbers when fetching config.
2014-01-14 18:28:19 +00:00
Aurelien Jacobs
d5876cfb4a
scpi: add VXI transport support
2014-01-11 22:36:09 +01:00
Aurelien Jacobs
a53278de01
rigol-ds: fix waveform reception on DS2000 series
...
The ":WAV:DATA?" scpi command must be sent before calling
sr_scpi_read_begin().
2014-01-03 17:54:47 +01:00
Martin Ling
05c644ea08
Revise SCPI read API to allow backend-independent data handling.
2013-12-29 04:26:36 +01:00
Martin Ling
821fbcadcc
rigol-ds: Support 4 analog channels.
2013-12-29 01:34:58 +01:00
Martin Ling
07ccb2b3f1
rigol-ds: Fix rigol_ds_channel_start() for digital channels.
2013-12-28 14:05:56 +01:00
Martin Ling
48460c6f3e
rigol-ds: Unify partial read handling.
2013-12-27 22:47:42 +01:00
Martin Ling
f80a0bf232
rigol-ds: Unify code for counting expected incoming bytes.
2013-12-27 22:47:42 +01:00
Martin Ling
677f85d00b
rigol-ds: Use rigol_ds_channel_start() function for legacy protocol too.
2013-12-27 22:47:42 +01:00
Martin Ling
0d87bd93eb
rigol-ds: Rename and document some confusingly named variables.
2013-12-27 22:47:42 +01:00
Martin Ling
962af1a379
rigol-ds: Support VS5000 series devices.
2013-12-04 21:38:05 +00:00
Martin Ling
56868b5d6b
rigol-ds: Handle partial analog frame reads.
...
Reading a frame over the DS1xx2 RS232 connection now sometimes works,
but most of the time stalls part way through with g_poll showing the
fd as not ready.
2013-12-04 13:31:42 +00:00
Martin Ling
17b5b20264
Replace rigol_ds_send() function with sr_scpi_send().
2013-12-04 10:30:46 +00:00
Martin Ling
ae1bc1cc26
Port rigol-ds driver to use common SCPI functions.
2013-12-03 23:19:40 +00:00
Martin Ling
ae67644fe5
Create & use new sr_usbtmc_dev_inst for Rigol DS driver.
2013-11-29 01:13:22 +00:00
Martin Ling
babab6225b
DS2000 sample memory capture patches from Mathias Grimmberger.
2013-11-29 00:57:55 +00:00
Martin Ling
355de5a110
Fix handling second channel on DS2000 series.
...
Patch from Mathias Grimmberger.
2013-11-29 00:55:21 +00:00
Martin Ling
bafd489094
rigol-ds: Add support for DS2xx2 series.
...
Based on patch by Mathias Grimmberger <mgri@zaphod.sax.de>.
2013-11-29 00:53:34 +00:00
Martin Ling
3086efdd73
Rename rigol-ds1xx2 driver to rigol-ds.
2013-11-29 00:50:59 +00:00