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

rigol-ds: Do not stop reading after the first frame

This commit is contained in:
Valentin Ochs 2020-06-11 13:53:12 +02:00 committed by Uwe Hermann
parent 9b09360654
commit 418c99248c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/rigol-ds/protocol.c
View File

@ -756,12 +756,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (devc->data_source != DATA_SOURCE_LIVE) if (devc->data_source != DATA_SOURCE_LIVE)
rigol_ds_set_wait_event(devc, WAIT_BLOCK); rigol_ds_set_wait_event(devc, WAIT_BLOCK);
} }
/* End acquisition when data for all channels is acquired. */
if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) { if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) {
sr_err("Read should have been completed"); sr_err("Read should have been completed");
std_session_send_df_frame_end(sdi);
sr_dev_acquisition_stop(sdi);
return TRUE;
} }
devc->num_block_read = 0; devc->num_block_read = 0;
} else { } else {
@ -795,7 +791,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
/* Done with this frame. */ /* Done with this frame. */
std_session_send_df_frame_end(sdi); std_session_send_df_frame_end(sdi);
if (++devc->num_frames == devc->limit_frames) { if (++devc->num_frames == devc->limit_frames || devc->data_source == DATA_SOURCE_MEMORY) {
/* Last frame, stop capture. */ /* Last frame, stop capture. */
sr_dev_acquisition_stop(sdi); sr_dev_acquisition_stop(sdi);
} else { } else {