BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds: fix waveform reception on DS2000 series 

The ":WAV:DATA?" scpi command must be sent before calling
sr_scpi_read_begin().
This commit is contained in:
Aurelien Jacobs 2014-01-01 18:24:45 +01:00
parent 036d378a62
commit a53278de01
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/rigol-ds/protocol.c
View File

@ -457,13 +457,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
probe = devc->channel_entry->data;
if (devc->num_block_bytes == 0 &&
devc->model->protocol == PROTOCOL_IEEE488_2) {
if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
return TRUE;
}
if (devc->num_block_bytes == 0) {
if (sr_scpi_read_begin(scpi) != SR_OK)
return TRUE;
if (devc->model->protocol == PROTOCOL_IEEE488_2) {
sr_dbg("New block header expected");
if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
return TRUE;
len = rigol_ds_read_header(scpi);
if (len == -1)
return TRUE;