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

rigol-ds: Experimental support for V5 frame reading

This commit is contained in:
Valentin Ochs 2020-06-11 14:24:49 +02:00 committed by Uwe Hermann
parent 8cbe5339b1
commit 19f31c8ace
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hardware/rigol-ds/api.c
View File

@ -946,21 +946,25 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
/* Set memory mode. */ /* Set memory mode. */
if (devc->data_source == DATA_SOURCE_SEGMENTED) { if (devc->data_source == DATA_SOURCE_SEGMENTED) {
if (devc->model->series->protocol == PROTOCOL_V4) { switch (devc->model->series->protocol) {
case PROTOCOL_V4:
{
int frames = 0; int frames = 0;
/* PROTOCOL_V5 has RECORD:FRAMES?, but this seems to return the
* maximum that should be captured, not the current amount. If
* we can figure out how to get the current number of frames,
* or when we've hit the last one, adding support for this will
* be possible as well.
*/
sr_scpi_get_int(sdi->conn, "FUNC:WREP:FEND?", &frames); sr_scpi_get_int(sdi->conn, "FUNC:WREP:FEND?", &frames);
if (frames <= 0) { if (frames <= 0) {
sr_err("No segmented data available"); sr_err("No segmented data available");
return SR_ERR; return SR_ERR;
} }
devc->num_frames_segmented = frames; devc->num_frames_segmented = frames;
} else { break;
}
case PROTOCOL_V5:
/* The frame limit has to be read on the fly, just set up
* reading of the first frame */
if (rigol_ds_config_set(sdi, "REC:CURR 1") != SR_OK)
return SR_ERR;
break;
default:
sr_err("Data source 'Segmented' not yet supported"); sr_err("Data source 'Segmented' not yet supported");
return SR_ERR; return SR_ERR;
} }

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

@ -431,7 +431,8 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
if (rigol_ds_config_set(sdi, ":SING") != SR_OK) if (rigol_ds_config_set(sdi, ":SING") != SR_OK)
return SR_ERR; return SR_ERR;
rigol_ds_set_wait_event(devc, WAIT_STOP); rigol_ds_set_wait_event(devc, WAIT_STOP);
if (devc->data_source == DATA_SOURCE_SEGMENTED) if (devc->data_source == DATA_SOURCE_SEGMENTED &&
devc->model->series->protocol == PROTOCOL_V4)
if (rigol_ds_config_set(sdi, "FUNC:WREP:FCUR %d", devc->num_frames + 1) != SR_OK) if (rigol_ds_config_set(sdi, "FUNC:WREP:FCUR %d", devc->num_frames + 1) != SR_OK)
return SR_ERR; return SR_ERR;
} }
@ -805,7 +806,22 @@ 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 || devc->num_frames++;
/* V5 has no way to read the number of recorded frames, so try to set the
* next frame and read it back instead.
*/
if (devc->data_source == DATA_SOURCE_SEGMENTED &&
devc->model->series->protocol == PROTOCOL_V5) {
int frames = 0;
if (rigol_ds_config_set(sdi, "REC:CURR %d", devc->num_frames + 1) != SR_OK)
return SR_ERR;
if (sr_scpi_get_int(sdi->conn, "REC:CURR?", &frames) != SR_OK)
return SR_ERR;
devc->num_frames_segmented = frames;
}
if (devc->num_frames == devc->limit_frames ||
devc->num_frames == devc->num_frames_segmented || devc->num_frames == devc->num_frames_segmented ||
devc->data_source == DATA_SOURCE_MEMORY) { devc->data_source == DATA_SOURCE_MEMORY) {
/* Last frame, stop capture. */ /* Last frame, stop capture. */