34ce4d8258
Fix #1576 by handling DSO1000B's CHAN#:PROB? responses
2020-07-12 23:30:20 +02:00
1b8a37c688
rigol-ds: Allow retrieving frame limit
2020-06-27 22:57:10 +02:00
6999029585
rigol-ds: Improve short block handling
...
When a short block is received, clean up the header state so that the
next block can be read.
Based on a patch for #1011 by Aleksander Alsekseev.
2020-06-25 00:03:24 +02:00
16e96ca3af
rigol-ds: Send some commands on 1st frame only
...
This can speed up reading of multiple segments by a factor 2 (9s vs 18s
when reading 5 frames with 2 channels and 7 kSa)
2020-06-24 23:58:17 +02:00
06ed999aa4
rigol-ds: Experimental support for segmented data with PROTOCOL_V3 models
2020-06-24 23:56:01 +02:00
19f31c8ace
rigol-ds: Experimental support for V5 frame reading
2020-06-24 23:56:01 +02:00
8cbe5339b1
rigol-ds: Add support for reading segmented data for protocol v4
2020-06-24 23:56:01 +02:00
704910e32c
rigol-ds: Fix reading data from internal memory
...
According to the programming manual, one should issue
:WAV:RES
:WAV:BEG
before reading data from internal memory. Without this, the wrong data
will be returned.
2020-06-24 23:56:01 +02:00
1cbb3b1cfb
rigol-ds: Get correct samplerate for Memory and Segmented sources
...
Read it at the start of acquisition. This prevents requests for
the SR from interfering with ongoing transfers.
This fixes bug #1217 .
2020-06-24 23:56:01 +02:00
418c99248c
rigol-ds: Do not stop reading after the first frame
2020-06-24 23:56:01 +02:00
77f3c5e51f
rigol-ds: Added support for the DS1202Z-E
2020-05-02 17:01:39 +02:00
4c5f70063a
Use std_session_send_df_frame_begin()/_end() where possible.
2020-04-08 23:54:25 +02:00
c4a46475a6
rigol-ds: Rigol DS1152E-EDU support fix
2020-03-16 23:44:25 +01:00
f6129c8f0c
rigol-ds: Add initial Rigol MSO5000 support.
...
This adds basic support for the Rigol MSO5000 series. It has
the same problems as the DS4000 series: Live capture provides
one digital channel per byte. Buffered memory returns the data
compressed (one byte has 8 digital channels), but the banks are
read separately. It's not possible to read uint16.
2019-08-21 14:54:12 +02:00
744d683ca7
rigol-ds: Add Agilent DSO1000B series IDs
2019-07-06 16:54:26 +02:00
47b821dc7d
rigol-ds: Fix memory buffer readout on DS4000 series.
2018-12-29 03:24:23 +01:00
0f523f2b45
rigol-ds: Add initial Agilent MSO7034A support.
...
Digital channels (and various other features) are not yet supported.
2018-06-22 22:53:11 +02:00
9ad1d49c4c
rigol-ds: Improve a log message.
2018-06-22 19:20:44 +02:00
55bece00aa
rigol-ds: Add missing "return SR_ERR".
2018-06-22 10:53:03 +02:00
6b04525ba2
rigol-ds: Initial patch for Rigol DS4000 support
...
This fixes bug #1208 .
2018-06-22 01:55:02 +02:00
643c8824a5
rigol-ds: Rename the CHANINFO macro and comment it
2018-06-22 00:47:09 +02:00
6bcc81ac3a
rigol-ds: Store trigger sources and their number for each model
...
Store trigger sources and their number for each model when it is probed
and use that.
This fixes bug #299 .
2018-06-22 00:35:44 +02:00
ce97fc3f6a
rigol-ds: Fix an issue causing only one channel to be acquired.
...
This fixes bug #1018 .
2018-04-22 18:36:12 +02:00
350501d0c3
rigol-ds: Make two log messages more specific.
...
Slightly modified version of a suggested change by Aleksander Alsekseev.
2018-04-22 16:49:33 +02:00
0306ae30b6
rigol-ds: silence potential NULL dereference compiler warning
...
Check pointers' validity before dereferencing them.
This was reported by clang's scan-build.
2018-02-09 21:37:39 +01:00
bbcffe51d2
rigol-ds: Fix crash when fetching logic channels
...
When refactoring the code, some places where sr_scpi_send was replaced
by rigol_ds_config_set the first argument was not changed from sdi->conn
to sdi. Fix the remaining ones.
Fix: https://sigrok.org/bug/1073
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-12-26 19:21:42 +01:00
fcd6a8bdf1
drivers: Factor out std_cg_idx().
2017-08-06 17:31:46 +02:00
758906aa71
drivers: Remove some unneeded 'ret' variables.
2017-07-31 16:23:31 +02:00
697fb6ddfc
drivers: Factor out std_*_idx*().
2017-07-31 16:23:31 +02:00
dd7a72ea69
drivers: Consistently use same indentation for config_*() API calls.
2017-07-31 16:23:31 +02:00
58ffcf9712
std_gvar_tuple_array(): Change to allow for more ARRAY_AND_SIZE usage.
...
Thanks to Marcus Comstedt <marcus@mc.pp.se> for the hint!
2017-07-21 19:04:34 +02:00
f8195cb2da
drivers: Shorten some unnecessarily long arrays.
2017-07-21 17:06:40 +02:00
9e411f4be8
rigol-ds: config_set: Move error printing to wrapper.
2017-07-21 17:06:40 +02:00
0f8bee7162
rigol-ds: Update a code comment.
2017-07-21 17:06:40 +02:00
396cdca0c3
rigol-ds: Drop two unneeded #defines.
2017-07-21 17:06:40 +02:00
53012da658
drivers: Use ARRAY_AND_SIZE where possible.
2017-07-21 17:06:40 +02:00
105df67463
drivers: Factor out std_gvar_array_*().
2017-07-21 16:54:05 +02:00
db944f1622
drivers: Factor out std_gvar_tuple_{array,rational}().
2017-07-21 16:40:15 +02:00
6b82c3e57a
drivers: Consistently name per-cg options 'devopts_cg_*'.
2017-07-21 15:45:03 +02:00
ca314e060f
drivers: Drop unneeded or duplicate comments.
...
Drop various comments which are not really needed, too verbose, document
obvious things, are duplicated across all drivers, or simply incorrect.
2017-07-21 15:23:56 +02:00
05199c0ac9
drivers: Provide proper drvopts.
...
The device class config keys should be in drvopts (not devopts).
2017-07-19 15:39:23 +02:00
e66d1892d0
drivers: Add and use STD_CONFIG_LIST().
...
This ensures consistent handling of the SR_CONF_SCAN_OPTIONS and
SR_CONF_DEVICE_OPTIONS (with sdi NULL or non-NULL) config keys
and also reduces copy-pasted boilerplate in the drivers a bit.
This function does not handle channel-group specific items, that's
very driver-specific and thus left to the individual drivers.
Also move some generic checks and error messages from the drivers into
the sr_config_list() wrapper.
2017-07-19 15:11:01 +02:00
3553451f1e
clear_helper(): Use a cast to shorten all implementations.
2017-07-13 11:59:11 +02:00
8bf18daabb
sr_dev_clear(): Always free sdi->priv (devc).
...
Until now, clear_helper() callbacks for std_dev_clear_with_callback()
were expected to g_free(devc), but not all of them did that.
Have std_dev_clear_with_callback() unconditionally g_free(sdi->priv)
(i.e., devc), regardless of whether a clear_helper() callback was
provided or not. It was doing g_free(sdi->priv) when no callback
was provided already anyway.
This makes the individual drivers' clear_helper() implementations
shorter and prevents errors such as missing g_free(devc) calls.
This works, because all drivers either call std_dev_clear_with_callback()
directly, or indirectly via std_dev_clear().
This also allows us to remove some no-longer needed dev_clear()
and clear_helper() implementations that only did g_free(devc)
in favor of std_dev_clear().
2017-07-13 11:59:11 +02:00
6e43c3d531
std: Rename std_dev_clear() to std_dev_clear_with_callback().
2017-07-13 11:59:11 +02:00
f1ba6b4b2c
sr_dev_close(): Set status to SR_ST_INACTIVE.
...
This ensures consistent checks and log messages across all drivers
and reduces the per-driver boilerplate.
2017-07-08 14:25:23 +02:00
7e46362338
sr_dev_open(): Set status to SR_ST_ACTIVE upon success.
...
This ensures consistent checks and log messages across all drivers
and reduces the per-driver boilerplate.
2017-07-08 14:25:23 +02:00
093e1cba6b
sr_dev_close(): Factor out SR_ERR_DEV_CLOSED check.
...
This ensures consistent checks and log messages across all drivers
and reduces the per-driver boilerplate.
2017-07-07 21:51:25 +02:00
c3cd66a00c
sr_config_set(): Factor out SR_ERR_DEV_CLOSED check.
...
This ensures consistent checks and log messages across all drivers
and reduces the per-driver boilerplate.
2017-07-07 21:51:19 +02:00
f670835f1f
Add sr_dev_acquisition_start(), factor out SR_ERR_DEV_CLOSED check.
...
This ensures consistent checks and log messages across all drivers
and reduces the per-driver boilerplate.
2017-07-07 21:51:16 +02:00
Valentin Ochs
Andy Lutomirski
Richard
Uwe Hermann
jirjirjir
Sebastian Reichel
Nadav Mavor
Martin Ling
Gerhard Sittig
Stefan Brüns