if (!(devc = sdi->priv))
return SR_ERR;
- if (devc->limit_frames == 0)
+ uint64_t limit_frames = devc->limit_frames;
+ if (devc->num_frames_segmented != 0 && devc->num_frames_segmented < limit_frames)
+ limit_frames = devc->num_frames_segmented;
+ if (limit_frames == 0)
sr_dbg("Starting data capture for frameset %" PRIu64,
devc->num_frames + 1);
else
sr_dbg("Starting data capture for frameset %" PRIu64 " of %"
- PRIu64, devc->num_frames + 1, devc->limit_frames);
+ PRIu64, devc->num_frames + 1, limit_frames);
switch (devc->model->series->protocol) {
case PROTOCOL_V1:
if (rigol_ds_config_set(sdi, ":SING") != SR_OK)
return SR_ERR;
rigol_ds_set_wait_event(devc, WAIT_STOP);
+ if (devc->data_source == DATA_SOURCE_SEGMENTED)
+ if (rigol_ds_config_set(sdi, "FUNC:WREP:FCUR %d", devc->num_frames + 1) != SR_OK)
+ return SR_ERR;
}
break;
}
devc->data_source == DATA_SOURCE_LIVE ?
":WAV:MODE NORM" :":WAV:MODE RAW") != SR_OK)
return SR_ERR;
+
+ if (devc->data_source != DATA_SOURCE_LIVE) {
+ if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
+ return SR_ERR;
+ }
break;
}
return TRUE;
}
- if (devc->model->series->protocol >= PROTOCOL_V3)
+ if (devc->model->series->protocol >= PROTOCOL_V3) {
+ if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK)
+ return TRUE;
if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
return TRUE;
+ }
if (sr_scpi_read_begin(scpi) != SR_OK)
return TRUE;
/* Done with this frame. */
std_session_send_df_frame_end(sdi);
- if (++devc->num_frames == devc->limit_frames || devc->data_source == DATA_SOURCE_MEMORY) {
+ if (++devc->num_frames == devc->limit_frames ||
+ devc->num_frames == devc->num_frames_segmented ||
+ devc->data_source == DATA_SOURCE_MEMORY) {
/* Last frame, stop capture. */
sr_dev_acquisition_stop(sdi);
} else {