* Timebase * num hor. divs * 85(%) * 1e6(usecs) / 100
* -> 85 percent of sweep time
*/
- s = (devc->timebase * devc->model->num_horizontal_divs
+ s = (devc->timebase * devc->model->series->num_horizontal_divs
* 85e6) / 100L;
sr_spew("Sleeping for %ld usecs instead of trigger-wait", s);
g_usleep(s);
static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *probe;
int tmp;
if (!(devc = sdi->priv))
probe = devc->channel_entry->data;
- if (devc->model->series <= RIGOL_DS1000)
+ if (devc->model->series->protocol <= PROTOCOL_V2)
return SR_OK;
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
if (!(devc = sdi->priv))
return SR_ERR;
- start = time(NULL);
+ if (devc->model->series->protocol >= PROTOCOL_V3) {
- do {
- if (time(NULL) - start >= 3) {
- sr_dbg("Timeout waiting for data block");
- return SR_ERR_TIMEOUT;
- }
+ start = time(NULL);
- /*
- * The scope copies data really slowly from sample
- * memory to its output buffer, so try not to bother
- * it too much with SCPI requests but don't wait too
- * long for short sample frame sizes.
- */
- g_usleep(devc->analog_frame_size < 15000 ? 100000 : 1000000);
+ do {
+ if (time(NULL) - start >= 3) {
+ sr_dbg("Timeout waiting for data block");
+ return SR_ERR_TIMEOUT;
+ }
- /* "READ,nnnn" (still working) or "IDLE,nnnn" (finished) */
- if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK)
- return SR_ERR;
+ /*
+ * The scope copies data really slowly from sample
+ * memory to its output buffer, so try not to bother
+ * it too much with SCPI requests but don't wait too
+ * long for short sample frame sizes.
+ */
+ g_usleep(devc->analog_frame_size < 15000 ? 100000 : 1000000);
- if (parse_int(buf + 5, &len) != SR_OK)
- return SR_ERR;
- } while (buf[0] == 'R' && len < 1000000);
+ /* "READ,nnnn" (still working) or "IDLE,nnnn" (finished) */
+ if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK)
+ return SR_ERR;
+
+ if (parse_int(buf + 5, &len) != SR_OK)
+ return SR_ERR;
+ } while (buf[0] == 'R' && len < 1000000);
+ }
rigol_ds_set_wait_event(devc, WAIT_NONE);
if (ret != SR_OK)
return SR_ERR;
- if (devc->model->series == RIGOL_DS1000) {
+ if (devc->model->series->protocol == PROTOCOL_V2) {
/* The DS1000 series needs this stupid delay, *OPC? doesn't work. */
sr_spew("delay %dms", 100);
g_usleep(100000);
sr_dbg("Starting data capture for frameset %lu of %lu",
devc->num_frames + 1, devc->limit_frames);
- if (devc->model->series >= RIGOL_DS1000Z)
- if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK)
- return SR_ERR;
-
- if (devc->data_source == DATA_SOURCE_LIVE) {
- if (devc->model->series <= RIGOL_DS1000) {
- if (rigol_ds_config_set(sdi, ":WAV:POIN:MODE NORM") != SR_OK)
+ switch (devc->model->series->protocol) {
+ case PROTOCOL_V1:
+ rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
+ break;
+ case PROTOCOL_V2:
+ if (devc->data_source == DATA_SOURCE_LIVE) {
+ if (rigol_ds_config_set(sdi, ":WAV:POIN:MODE NORMAL") != SR_OK)
return SR_ERR;
+ rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
} else {
- if (rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK)
- return SR_ERR;
- }
- rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
- } else {
- if (devc->model->series <= RIGOL_DS1000) {
if (rigol_ds_config_set(sdi, ":STOP") != SR_OK)
return SR_ERR;
if (rigol_ds_config_set(sdi, ":WAV:POIN:MODE RAW") != SR_OK)
return SR_ERR;
if (rigol_ds_config_set(sdi, ":RUN") != SR_OK)
return SR_ERR;
+ rigol_ds_set_wait_event(devc, WAIT_STOP);
+ }
+ break;
+ case PROTOCOL_V3:
+ if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK)
+ return SR_ERR;
+ if (devc->data_source == DATA_SOURCE_LIVE) {
+ if (rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK)
+ return SR_ERR;
+ rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
} else {
if (rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK)
return SR_ERR;
if (rigol_ds_config_set(sdi, ":SING") != SR_OK)
return SR_ERR;
+ rigol_ds_set_wait_event(devc, WAIT_STOP);
}
- rigol_ds_set_wait_event(devc, WAIT_STOP);
+ break;
}
return SR_OK;
SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *probe;
if (!(devc = sdi->priv))
return SR_ERR;
sr_dbg("Starting reading data from channel %d", probe->index + 1);
- if (devc->model->series < RIGOL_DS1000Z) {
+ if (devc->model->series->protocol <= PROTOCOL_V2) {
if (probe->type == SR_PROBE_LOGIC) {
if (sr_scpi_send(sdi->conn, ":WAV:DATA? DIG") != SR_OK)
return SR_ERR;
return SR_ERR;
if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK)
return SR_ERR;
- rigol_ds_set_wait_event(devc, WAIT_BLOCK);
- } else
- rigol_ds_set_wait_event(devc, WAIT_NONE);
+ }
}
+ rigol_ds_set_wait_event(devc, WAIT_BLOCK);
+
devc->num_channel_bytes = 0;
+ devc->num_header_bytes = 0;
devc->num_block_bytes = 0;
return SR_OK;
}
/* Read the header of a data block */
-static int rigol_ds_read_header(struct sr_scpi_dev_inst *scpi)
+static int rigol_ds_read_header(struct sr_dev_inst *sdi)
{
- char start[3], length[10];
- int len, tmp;
-
- /* Read the hashsign and length digit. */
- tmp = sr_scpi_read_data(scpi, start, 2);
- start[2] = '\0';
- if (tmp != 2) {
- sr_err("Failed to read first two bytes of data block header.");
- return -1;
+ struct sr_scpi_dev_inst *scpi = sdi->conn;
+ struct dev_context *devc = sdi->priv;
+ char *buf = (char *) devc->buffer;
+ size_t header_length;
+ int ret;
+
+ /* Try to read the hashsign and length digit. */
+ if (devc->num_header_bytes < 2) {
+ ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
+ 2 - devc->num_header_bytes);
+ if (ret < 0) {
+ sr_err("Read error while reading data header.");
+ return SR_ERR;
+ }
+ devc->num_header_bytes += ret;
}
- if (start[0] != '#' || !isdigit(start[1]) || start[1] == '0') {
- sr_err("Received invalid data block header start '%s'.", start);
- return -1;
+
+ if (devc->num_header_bytes < 2)
+ return 0;
+
+ if (buf[0] != '#' || !isdigit(buf[1]) || buf[1] == '0') {
+ sr_err("Received invalid data block header '%c%c'.", buf[0], buf[1]);
+ return SR_ERR;
}
- len = atoi(start + 1);
- /* Read the data length. */
- tmp = sr_scpi_read_data(scpi, length, len);
- length[len] = '\0';
- if (tmp != len) {
- sr_err("Failed to read %d bytes of data block length.", len);
- return -1;
+ header_length = 2 + buf[1] - '0';
+
+ /* Try to read the length. */
+ if (devc->num_header_bytes < header_length) {
+ ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
+ header_length - devc->num_header_bytes);
+ if (ret < 0) {
+ sr_err("Read error while reading data header.");
+ return SR_ERR;
+ }
+ devc->num_header_bytes += ret;
}
- if (parse_int(length, &len) != SR_OK) {
- sr_err("Received invalid data block length '%s'.", length);
+
+ if (devc->num_header_bytes < header_length)
+ return 0;
+
+ /* Read the data length. */
+ buf[header_length] = '\0';
+
+ if (parse_int(buf + 2, &ret) != SR_OK) {
+ sr_err("Received invalid data block length '%s'.", buf + 2);
return -1;
}
- sr_dbg("Received data block header: %s%s -> block length %d", start, length, len);
+ sr_dbg("Received data block header: '%s' -> block length %d", buf, ret);
- return len;
+ return ret;
}
SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
struct sr_datafeed_logic logic;
double vdiv, offset;
int len, i, vref;
- struct sr_probe *probe;
+ struct sr_channel *probe;
gsize expected_data_bytes;
(void)fd;
return TRUE;
if (rigol_ds_channel_start(sdi) != SR_OK)
return TRUE;
- break;
+ return TRUE;
case WAIT_BLOCK:
if (rigol_ds_block_wait(sdi) != SR_OK)
return TRUE;
devc->analog_frame_size : devc->digital_frame_size;
if (devc->num_block_bytes == 0) {
- if (devc->model->series >= RIGOL_DS1000Z)
+ if (devc->model->series->protocol >= PROTOCOL_V3)
if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
return TRUE;
if (sr_scpi_read_begin(scpi) != SR_OK)
return TRUE;
- if (devc->protocol == PROTOCOL_IEEE488_2) {
+ if (devc->format == FORMAT_IEEE488_2) {
sr_dbg("New block header expected");
- len = rigol_ds_read_header(scpi);
- if (len == -1)
+ len = rigol_ds_read_header(sdi);
+ if (len == 0)
+ /* Still reading the header. */
+ return TRUE;
+ if (len == -1) {
+ sr_err("Read error, aborting capture.");
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(cb_data, &packet);
+ sdi->driver->dev_acquisition_stop(sdi, cb_data);
return TRUE;
+ }
/* At slow timebases in live capture the DS2072
* sometimes returns "short" data blocks, with
* apparently no way to get the rest of the data.
}
len = devc->num_block_bytes - devc->num_block_read;
- len = sr_scpi_read_data(scpi, (char *)devc->buffer,
- len < ACQ_BUFFER_SIZE ? len : ACQ_BUFFER_SIZE);
+ if (len > ACQ_BUFFER_SIZE)
+ len = ACQ_BUFFER_SIZE;
+ sr_dbg("Requesting read of %d bytes", len);
- sr_dbg("Received %d bytes.", len);
- if (len == -1)
+ len = sr_scpi_read_data(scpi, (char *)devc->buffer, len);
+
+ if (len == -1) {
+ sr_err("Read error, aborting capture.");
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(cb_data, &packet);
+ sdi->driver->dev_acquisition_stop(sdi, cb_data);
return TRUE;
+ }
+
+ sr_dbg("Received %d bytes.", len);
devc->num_block_read += len;
vref = devc->vert_reference[probe->index];
vdiv = devc->vdiv[probe->index] / 25.6;
offset = devc->vert_offset[probe->index];
- if (devc->model->series >= RIGOL_DS1000Z)
+ if (devc->model->series->protocol >= PROTOCOL_V3)
for (i = 0; i < len; i++)
devc->data[i] = ((int)devc->buffer[i] - vref) * vdiv - offset;
else
if (devc->num_block_read == devc->num_block_bytes) {
sr_dbg("Block has been completed");
- if (devc->protocol == PROTOCOL_IEEE488_2) {
+ if (devc->model->series->protocol >= PROTOCOL_V3) {
/* Discard the terminating linefeed */
sr_scpi_read_data(scpi, (char *)devc->buffer, 1);
+ }
+ if (devc->format == FORMAT_IEEE488_2) {
/* Prepare for possible next block */
+ devc->num_header_bytes = 0;
devc->num_block_bytes = 0;
if (devc->data_source != DATA_SOURCE_LIVE)
rigol_ds_set_wait_event(devc, WAIT_BLOCK);
}
if (!sr_scpi_read_complete(scpi)) {
sr_err("Read should have been completed");
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(cb_data, &packet);
sdi->driver->dev_acquisition_stop(sdi, cb_data);
return TRUE;
}
return TRUE;
/* End of data for this channel. */
- if (devc->model->series >= RIGOL_DS1000Z) {
+ if (devc->model->series->protocol >= PROTOCOL_V3) {
/* Signal end of data download to scope */
if (devc->data_source != DATA_SOURCE_LIVE)
/*
sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
sr_dbg("Current vertical reference:");
- if (devc->model->series >= RIGOL_DS1000Z) {
+ if (devc->model->series->protocol >= PROTOCOL_V3) {
/* Vertical reference - not certain if this is the place to read it. */
for (i = 0; i < devc->model->analog_channels; i++) {
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", i + 1) != SR_OK)