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

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)
This commit is contained in:
Valentin Ochs 2020-06-14 03:23:36 +02:00 committed by Uwe Hermann
parent 06ed999aa4
commit 16e96ca3af
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,8 @@ static const struct rigol_ds_model supported_models[] = {
static struct sr_dev_driver rigol_ds_driver_info; static struct sr_dev_driver rigol_ds_driver_info;
static int analog_frame_size(const struct sr_dev_inst *);
static void clear_helper(struct dev_context *devc) static void clear_helper(struct dev_context *devc)
{ {
unsigned int i; unsigned int i;

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

@ -338,6 +338,8 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
if (!(devc = sdi->priv)) if (!(devc = sdi->priv))
return SR_ERR; return SR_ERR;
const gboolean first_frame = (devc->num_frames == 0);
uint64_t limit_frames = devc->limit_frames; uint64_t limit_frames = devc->limit_frames;
if (devc->num_frames_segmented != 0 && devc->num_frames_segmented < limit_frames) if (devc->num_frames_segmented != 0 && devc->num_frames_segmented < limit_frames)
limit_frames = devc->num_frames_segmented; limit_frames = devc->num_frames_segmented;
@ -374,17 +376,17 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
case PROTOCOL_V3: case PROTOCOL_V3:
case PROTOCOL_V4: case PROTOCOL_V4:
case PROTOCOL_V5: case PROTOCOL_V5:
if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK) if (first_frame && rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK)
return SR_ERR; return SR_ERR;
if (devc->data_source == DATA_SOURCE_LIVE) { if (devc->data_source == DATA_SOURCE_LIVE) {
if (rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK) if (first_frame && rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK)
return SR_ERR; return SR_ERR;
devc->analog_frame_size = devc->model->series->live_samples; devc->analog_frame_size = devc->model->series->live_samples;
devc->digital_frame_size = devc->model->series->live_samples; devc->digital_frame_size = devc->model->series->live_samples;
rigol_ds_set_wait_event(devc, WAIT_TRIGGER); rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
} else { } else {
if (devc->model->series->protocol == PROTOCOL_V3) { if (devc->model->series->protocol == PROTOCOL_V3) {
if (rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK) if (first_frame && rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK)
return SR_ERR; return SR_ERR;
} else if (devc->model->series->protocol >= PROTOCOL_V4) { } else if (devc->model->series->protocol >= PROTOCOL_V4) {
num_channels = 0; num_channels = 0;
@ -404,7 +406,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
} }
buffer_samples = devc->model->series->buffer_samples; buffer_samples = devc->model->series->buffer_samples;
if (buffer_samples == 0) if (first_frame && buffer_samples == 0)
{ {
/* The DS4000 series does not have a fixed memory depth, it /* The DS4000 series does not have a fixed memory depth, it
* can be chosen from the menu and also varies with number * can be chosen from the menu and also varies with number
@ -414,7 +416,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
devc->analog_frame_size = devc->digital_frame_size = devc->analog_frame_size = devc->digital_frame_size =
buffer_samples; buffer_samples;
} }
else else if (first_frame)
{ {
/* The DS1000Z series has a fixed memory depth which we /* The DS1000Z series has a fixed memory depth which we
* need to divide correctly according to the number of * need to divide correctly according to the number of
@ -428,7 +430,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
} }
} }
if (rigol_ds_config_set(sdi, ":SING") != SR_OK) if (devc->data_source == DATA_SOURCE_LIVE && rigol_ds_config_set(sdi, ":SINGL") != 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 &&
@ -455,6 +457,8 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
sr_dbg("Starting reading data from channel %d", ch->index + 1); sr_dbg("Starting reading data from channel %d", ch->index + 1);
const gboolean first_frame = (devc->num_frames == 0);
switch (devc->model->series->protocol) { switch (devc->model->series->protocol) {
case PROTOCOL_V1: case PROTOCOL_V1:
case PROTOCOL_V2: case PROTOCOL_V2:
@ -496,7 +500,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
if (rigol_ds_config_set(sdi, if (first_frame && rigol_ds_config_set(sdi,
devc->data_source == DATA_SOURCE_LIVE ? devc->data_source == DATA_SOURCE_LIVE ?
":WAV:MODE NORM" :":WAV:MODE RAW") != SR_OK) ":WAV:MODE NORM" :":WAV:MODE RAW") != SR_OK)
return SR_ERR; return SR_ERR;
@ -511,15 +515,15 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
if (devc->model->series->protocol >= PROTOCOL_V3 && if (devc->model->series->protocol >= PROTOCOL_V3 &&
ch->type == SR_CHANNEL_ANALOG) { ch->type == SR_CHANNEL_ANALOG) {
/* Vertical increment. */ /* Vertical increment. */
if (sr_scpi_get_float(sdi->conn, ":WAV:YINC?", if (first_frame && sr_scpi_get_float(sdi->conn, ":WAV:YINC?",
&devc->vert_inc[ch->index]) != SR_OK) &devc->vert_inc[ch->index]) != SR_OK)
return SR_ERR; return SR_ERR;
/* Vertical origin. */ /* Vertical origin. */
if (sr_scpi_get_float(sdi->conn, ":WAV:YOR?", if (first_frame && sr_scpi_get_float(sdi->conn, ":WAV:YOR?",
&devc->vert_origin[ch->index]) != SR_OK) &devc->vert_origin[ch->index]) != SR_OK)
return SR_ERR; return SR_ERR;
/* Vertical reference. */ /* Vertical reference. */
if (sr_scpi_get_int(sdi->conn, ":WAV:YREF?", if (first_frame && sr_scpi_get_int(sdi->conn, ":WAV:YREF?",
&devc->vert_reference[ch->index]) != SR_OK) &devc->vert_reference[ch->index]) != SR_OK)
return SR_ERR; return SR_ERR;
} else if (ch->type == SR_CHANNEL_ANALOG) { } else if (ch->type == SR_CHANNEL_ANALOG) {
@ -621,6 +625,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (!(revents == G_IO_IN || revents == 0)) if (!(revents == G_IO_IN || revents == 0))
return TRUE; return TRUE;
const gboolean first_frame = (devc->num_frames == 0);
switch (devc->wait_event) { switch (devc->wait_event) {
case WAIT_NONE: case WAIT_NONE:
break; break;
@ -654,10 +660,10 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (devc->num_block_bytes == 0) { if (devc->num_block_bytes == 0) {
if (devc->model->series->protocol >= PROTOCOL_V4) { if (devc->model->series->protocol >= PROTOCOL_V4) {
if (rigol_ds_config_set(sdi, ":WAV:START %d", if (first_frame && rigol_ds_config_set(sdi, ":WAV:START %d",
devc->num_channel_bytes + 1) != SR_OK) devc->num_channel_bytes + 1) != SR_OK)
return TRUE; return TRUE;
if (rigol_ds_config_set(sdi, ":WAV:STOP %d", if (first_frame && rigol_ds_config_set(sdi, ":WAV:STOP %d",
MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE, MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE,
devc->analog_frame_size)) != SR_OK) devc->analog_frame_size)) != SR_OK)
return TRUE; return TRUE;