* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdlib.h>
#include <stdarg.h>
#include <unistd.h>
#include <ctype.h>
#include <time.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
+#include "scpi.h"
#include "protocol.h"
/*
*/
static int rigol_ds_event_wait(const struct sr_dev_inst *sdi, char status1, char status2)
{
- char *buf;
+ char *buf, c;
struct dev_context *devc;
time_t start;
if (sr_scpi_get_string(sdi->conn, ":TRIG:STAT?", &buf) != SR_OK)
return SR_ERR;
- } while (buf[0] == status1 || buf[0] == status2);
+ c = buf[0];
+ g_free(buf);
+ } while (c == status1 || c == status2);
devc->wait_status = 2;
}
if (sr_scpi_get_string(sdi->conn, ":TRIG:STAT?", &buf) != SR_OK)
return SR_ERR;
- } while (buf[0] != status1 && buf[0] != status2);
+ c = buf[0];
+ g_free(buf);
+ } while (c != status1 && c != status2);
rigol_ds_set_wait_event(devc, WAIT_NONE);
}
if (!(devc = sdi->priv))
return SR_ERR;
- /*
+ /*
* If timebase < 50 msecs/DIV just sleep about one sweep time except
* for really fast sweeps.
*/
ch = devc->channel_entry->data;
- if (devc->model->series->protocol <= PROTOCOL_V2)
+ if (devc->model->series->protocol != PROTOCOL_V3)
return SR_OK;
- if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
- ch->index + 1) != SR_OK)
- return SR_ERR;
+ if (ch->type == SR_CHANNEL_LOGIC) {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK)
+ return SR_ERR;
+ } else {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
+ ch->index + 1) != SR_OK)
+ return SR_ERR;
+ }
/* Check that the number of samples will be accepted */
- if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
+ if (rigol_ds_config_set(sdi, ":WAV:POIN %d",
+ ch->type == SR_CHANNEL_LOGIC ?
+ devc->digital_frame_size :
+ devc->analog_frame_size) != SR_OK)
return SR_ERR;
if (sr_scpi_get_int(sdi->conn, "*ESR?", &tmp) != SR_OK)
return SR_ERR;
if (tmp & 0x10) {
sr_warn("Single shot acquisition failed, retrying...");
/* Sleep a bit, otherwise the single shot will often fail */
- g_usleep(500000);
+ g_usleep(500 * 1000);
rigol_ds_config_set(sdi, ":SING");
rigol_ds_set_wait_event(devc, WAIT_STOP);
return SR_ERR;
char *buf;
struct dev_context *devc;
time_t start;
- int len;
+ int len, ret;
if (!(devc = sdi->priv))
return SR_ERR;
- if (devc->model->series->protocol >= PROTOCOL_V3) {
+ if (devc->model->series->protocol == PROTOCOL_V3) {
start = time(NULL);
* 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);
+ g_usleep(devc->analog_frame_size < (15 * 1000) ? (100 * 1000) : (1000 * 1000));
/* "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)
+ ret = parse_int(buf + 5, &len);
+ g_free(buf);
+ if (ret != SR_OK)
return SR_ERR;
- } while (buf[0] == 'R' && len < 1000000);
+ } while (buf[0] == 'R' && len < (1000 * 1000));
}
rigol_ds_set_wait_event(devc, WAIT_NONE);
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);
+ g_usleep(100 * 1000);
return SR_OK;
} else {
return sr_scpi_get_opc(sdi->conn);
{
struct dev_context *devc;
gchar *trig_mode;
+ unsigned int num_channels, i, j;
+ int buffer_samples;
+ int ret;
if (!(devc = sdi->priv))
return SR_ERR;
- sr_dbg("Starting data capture for frameset %lu of %lu",
- devc->num_frames + 1, devc->limit_frames);
+ const gboolean first_frame = (devc->num_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, limit_frames);
switch (devc->model->series->protocol) {
case PROTOCOL_V1:
return SR_ERR;
if (sr_scpi_get_string(sdi->conn, ":TRIG:MODE?", &trig_mode) != SR_OK)
return SR_ERR;
- if (rigol_ds_config_set(sdi, ":TRIG:%s:SWE SING", trig_mode) != SR_OK)
+ ret = rigol_ds_config_set(sdi, ":TRIG:%s:SWE SING", trig_mode);
+ g_free(trig_mode);
+ if (ret != SR_OK)
return SR_ERR;
if (rigol_ds_config_set(sdi, ":RUN") != SR_OK)
return SR_ERR;
}
break;
case PROTOCOL_V3:
- if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK)
+ case PROTOCOL_V4:
+ case PROTOCOL_V5:
+ if (first_frame && 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)
+ if (first_frame && rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK)
return SR_ERR;
+ devc->analog_frame_size = devc->model->series->live_samples;
+ devc->digital_frame_size = devc->model->series->live_samples;
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)
+ if (devc->model->series->protocol == PROTOCOL_V3) {
+ if (first_frame && rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK)
+ return SR_ERR;
+ } else if (devc->model->series->protocol >= PROTOCOL_V4) {
+ num_channels = 0;
+
+ /* Channels 3 and 4 are multiplexed with D0-7 and D8-15 */
+ for (i = 0; i < devc->model->analog_channels; i++) {
+ if (devc->analog_channels[i]) {
+ num_channels++;
+ } else if (i >= 2 && devc->model->has_digital) {
+ for (j = 0; j < 8; j++) {
+ if (devc->digital_channels[8 * (i - 2) + j]) {
+ num_channels++;
+ break;
+ }
+ }
+ }
+ }
+
+ buffer_samples = devc->model->series->buffer_samples;
+ if (first_frame && buffer_samples == 0)
+ {
+ /* The DS4000 series does not have a fixed memory depth, it
+ * can be chosen from the menu and also varies with number
+ * of active channels. Retrieve the actual number with the
+ * ACQ:MDEP command. */
+ sr_scpi_get_int(sdi->conn, "ACQ:MDEP?", &buffer_samples);
+ devc->analog_frame_size = devc->digital_frame_size =
+ buffer_samples;
+ }
+ else if (first_frame)
+ {
+ /* The DS1000Z series has a fixed memory depth which we
+ * need to divide correctly according to the number of
+ * active channels. */
+ devc->analog_frame_size = devc->digital_frame_size =
+ num_channels == 1 ?
+ buffer_samples :
+ num_channels == 2 ?
+ buffer_samples / 2 :
+ buffer_samples / 4;
+ }
+ }
+
+ if (devc->data_source == DATA_SOURCE_LIVE && rigol_ds_config_set(sdi, ":SINGL") != SR_OK)
return SR_ERR;
rigol_ds_set_wait_event(devc, WAIT_STOP);
+ 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)
+ return SR_ERR;
}
break;
}
sr_dbg("Starting reading data from channel %d", ch->index + 1);
- if (devc->model->series->protocol <= PROTOCOL_V2) {
+ const gboolean first_frame = (devc->num_frames == 0);
+
+ switch (devc->model->series->protocol) {
+ case PROTOCOL_V1:
+ case PROTOCOL_V2:
if (ch->type == SR_CHANNEL_LOGIC) {
if (sr_scpi_send(sdi->conn, ":WAV:DATA? DIG") != SR_OK)
return SR_ERR;
return SR_ERR;
}
rigol_ds_set_wait_event(devc, WAIT_NONE);
- } else {
- if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
- ch->index + 1) != SR_OK)
- return SR_ERR;
+ break;
+ case PROTOCOL_V3:
+ if (ch->type == SR_CHANNEL_LOGIC) {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK)
+ return SR_ERR;
+ } else {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
+ ch->index + 1) != 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;
if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK)
return SR_ERR;
}
+ break;
+ case PROTOCOL_V4:
+ case PROTOCOL_V5:
+ if (ch->type == SR_CHANNEL_ANALOG) {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
+ ch->index + 1) != SR_OK)
+ return SR_ERR;
+ } else {
+ if (rigol_ds_config_set(sdi, ":WAV:SOUR D%d",
+ ch->index) != SR_OK)
+ return SR_ERR;
+ }
+
+ if (first_frame && rigol_ds_config_set(sdi,
+ 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;
+ }
+
+ if (devc->model->series->protocol >= PROTOCOL_V3 &&
+ ch->type == SR_CHANNEL_ANALOG) {
+ /* Vertical increment. */
+ if (first_frame && sr_scpi_get_float(sdi->conn, ":WAV:YINC?",
+ &devc->vert_inc[ch->index]) != SR_OK)
+ return SR_ERR;
+ /* Vertical origin. */
+ if (first_frame && sr_scpi_get_float(sdi->conn, ":WAV:YOR?",
+ &devc->vert_origin[ch->index]) != SR_OK)
+ return SR_ERR;
+ /* Vertical reference. */
+ if (first_frame && sr_scpi_get_int(sdi->conn, ":WAV:YREF?",
+ &devc->vert_reference[ch->index]) != SR_OK)
+ return SR_ERR;
+ } else if (ch->type == SR_CHANNEL_ANALOG) {
+ devc->vert_inc[ch->index] = devc->vdiv[ch->index] / 25.6;
}
rigol_ds_set_wait_event(devc, WAIT_BLOCK);
struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_logic logic;
- double vdiv, offset;
+ double vdiv, offset, origin;
int len, i, vref;
struct sr_channel *ch;
gsize expected_data_bytes;
scpi = sdi->conn;
- if (revents == G_IO_IN || revents == 0) {
- switch(devc->wait_event) {
- case WAIT_NONE:
- break;
- case WAIT_TRIGGER:
- if (rigol_ds_trigger_wait(sdi) != SR_OK)
- return TRUE;
- if (rigol_ds_channel_start(sdi) != SR_OK)
- return TRUE;
+ if (!(revents == G_IO_IN || revents == 0))
+ return TRUE;
+
+ const gboolean first_frame = (devc->num_frames == 0);
+
+ switch (devc->wait_event) {
+ case WAIT_NONE:
+ break;
+ case WAIT_TRIGGER:
+ if (rigol_ds_trigger_wait(sdi) != SR_OK)
return TRUE;
- case WAIT_BLOCK:
- if (rigol_ds_block_wait(sdi) != SR_OK)
- return TRUE;
- break;
- case WAIT_STOP:
- if (rigol_ds_stop_wait(sdi) != SR_OK)
- return TRUE;
- if (rigol_ds_check_stop(sdi) != SR_OK)
- return TRUE;
- if (rigol_ds_channel_start(sdi) != SR_OK)
- return TRUE;
+ if (rigol_ds_channel_start(sdi) != SR_OK)
return TRUE;
- default:
- sr_err("BUG: Unknown event target encountered");
- break;
- }
-
- ch = devc->channel_entry->data;
+ return TRUE;
+ case WAIT_BLOCK:
+ if (rigol_ds_block_wait(sdi) != SR_OK)
+ return TRUE;
+ break;
+ case WAIT_STOP:
+ if (rigol_ds_stop_wait(sdi) != SR_OK)
+ return TRUE;
+ if (rigol_ds_check_stop(sdi) != SR_OK)
+ return TRUE;
+ if (rigol_ds_channel_start(sdi) != SR_OK)
+ return TRUE;
+ return TRUE;
+ default:
+ sr_err("BUG: Unknown event target encountered");
+ break;
+ }
- expected_data_bytes = ch->type == SR_CHANNEL_ANALOG ?
- devc->analog_frame_size : devc->digital_frame_size;
+ ch = devc->channel_entry->data;
- if (devc->num_block_bytes == 0) {
- if (devc->model->series->protocol >= PROTOCOL_V3)
- if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
- return TRUE;
+ expected_data_bytes = ch->type == SR_CHANNEL_ANALOG ?
+ devc->analog_frame_size : devc->digital_frame_size;
- if (sr_scpi_read_begin(scpi) != SR_OK)
+ if (devc->num_block_bytes == 0) {
+ if (devc->model->series->protocol >= PROTOCOL_V4) {
+ if (first_frame && rigol_ds_config_set(sdi, ":WAV:START %d",
+ devc->num_channel_bytes + 1) != SR_OK)
+ return TRUE;
+ if (first_frame && rigol_ds_config_set(sdi, ":WAV:STOP %d",
+ MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE,
+ devc->analog_frame_size)) != SR_OK)
return TRUE;
-
- if (devc->format == FORMAT_IEEE488_2) {
- sr_dbg("New block header expected");
- 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.
- * Discard these, the complete data block will
- * appear eventually.
- */
- if (devc->data_source == DATA_SOURCE_LIVE
- && (unsigned)len < expected_data_bytes) {
- sr_dbg("Discarding short data block");
- sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
- return TRUE;
- }
- devc->num_block_bytes = len;
- } else {
- devc->num_block_bytes = expected_data_bytes;
- }
- devc->num_block_read = 0;
}
- len = devc->num_block_bytes - devc->num_block_read;
- if (len > ACQ_BUFFER_SIZE)
- len = ACQ_BUFFER_SIZE;
- sr_dbg("Requesting read of %d bytes", len);
-
- 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;
+ 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;
}
- sr_dbg("Received %d bytes.", len);
-
- devc->num_block_read += len;
-
- if (ch->type == SR_CHANNEL_ANALOG) {
- vref = devc->vert_reference[ch->index];
- vdiv = devc->vdiv[ch->index] / 25.6;
- offset = devc->vert_offset[ch->index];
- if (devc->model->series->protocol >= PROTOCOL_V3)
- for (i = 0; i < len; i++)
- devc->data[i] = ((int)devc->buffer[i] - vref) * vdiv - offset;
- else
- for (i = 0; i < len; i++)
- devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
- analog.channels = g_slist_append(NULL, ch);
- analog.num_samples = len;
- analog.data = devc->data;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- sr_session_send(cb_data, &packet);
- g_slist_free(analog.channels);
- } else {
- logic.length = len;
- logic.unitsize = 2;
- logic.data = devc->buffer;
- packet.type = SR_DF_LOGIC;
- packet.payload = &logic;
- sr_session_send(cb_data, &packet);
- }
+ if (sr_scpi_read_begin(scpi) != SR_OK)
+ return TRUE;
- if (devc->num_block_read == devc->num_block_bytes) {
- sr_dbg("Block has been completed");
- 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) {
+ sr_dbg("New block header expected");
+ len = rigol_ds_read_header(sdi);
+ if (len == 0)
+ /* Still reading the header. */
+ return TRUE;
+ if (len == -1) {
+ sr_err("Error while reading block header, aborting capture.");
+ std_session_send_df_frame_end(sdi);
+ sr_dev_acquisition_stop(sdi);
+ return TRUE;
}
- if (devc->format == FORMAT_IEEE488_2) {
- /* Prepare for possible next block */
+ /* At slow timebases in live capture the DS2072 and
+ * DS1054Z sometimes return "short" data blocks, with
+ * apparently no way to get the rest of the data.
+ * Discard these, the complete data block will appear
+ * eventually.
+ */
+ if (devc->data_source == DATA_SOURCE_LIVE
+ && (unsigned)len < expected_data_bytes) {
+ sr_dbg("Discarding short data block: got %d/%d bytes\n", len, (int)expected_data_bytes);
+ sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
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;
}
- devc->num_block_read = 0;
+ devc->num_block_bytes = len;
} else {
- sr_dbg("%d of %d block bytes read", devc->num_block_read, devc->num_block_bytes);
+ devc->num_block_bytes = expected_data_bytes;
}
+ devc->num_block_read = 0;
+ }
- devc->num_channel_bytes += len;
+ len = devc->num_block_bytes - devc->num_block_read;
+ if (len > ACQ_BUFFER_SIZE)
+ len = ACQ_BUFFER_SIZE;
+ sr_dbg("Requesting read of %d bytes", len);
- if (devc->num_channel_bytes < expected_data_bytes)
- /* Don't have the full data for this channel yet, re-run. */
- return TRUE;
+ len = sr_scpi_read_data(scpi, (char *)devc->buffer, len);
+
+ if (len == -1) {
+ sr_err("Error while reading block data, aborting capture.");
+ std_session_send_df_frame_end(sdi);
+ sr_dev_acquisition_stop(sdi);
+ return TRUE;
+ }
+
+ sr_dbg("Received %d bytes.", len);
+
+ devc->num_block_read += len;
+
+ if (ch->type == SR_CHANNEL_ANALOG) {
+ vref = devc->vert_reference[ch->index];
+ vdiv = devc->vert_inc[ch->index];
+ origin = devc->vert_origin[ch->index];
+ offset = devc->vert_offset[ch->index];
+ if (devc->model->series->protocol >= PROTOCOL_V3)
+ for (i = 0; i < len; i++)
+ devc->data[i] = ((int)devc->buffer[i] - vref - origin) * vdiv;
+ else
+ for (i = 0; i < len; i++)
+ devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
+ float vdivlog = log10f(vdiv);
+ int digits = -(int)vdivlog + (vdivlog < 0.0);
+ sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+ analog.meaning->channels = g_slist_append(NULL, ch);
+ analog.num_samples = len;
+ analog.data = devc->data;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
+ } else {
+ logic.length = len;
+ // TODO: For the MSO1000Z series, we need a way to express that
+ // this data is in fact just for a single channel, with the valid
+ // data for that channel in the LSB of each byte.
+ logic.unitsize = devc->model->series->protocol >= PROTOCOL_V4 ? 1 : 2;
+ logic.data = devc->buffer;
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ sr_session_send(sdi, &packet);
+ }
- /* End of data for this channel. */
+ if (devc->num_block_read == devc->num_block_bytes) {
+ sr_dbg("Block has been completed");
if (devc->model->series->protocol >= PROTOCOL_V3) {
- /* Signal end of data download to scope */
+ /* 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)
- /*
- * This causes a query error, without it switching
- * to the next channel causes an error. Fun with
- * firmware...
- */
- rigol_ds_config_set(sdi, ":WAV:END");
+ rigol_ds_set_wait_event(devc, WAIT_BLOCK);
}
+ if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) {
+ sr_err("Read should have been completed");
+ }
+ devc->num_block_read = 0;
+ } else {
+ sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+ devc->num_block_read, devc->num_block_bytes);
+ }
- if (ch->type == SR_CHANNEL_ANALOG
- && devc->channel_entry->next != NULL) {
- /* We got the frame for this analog channel, but
- * there's another analog channel. */
- devc->channel_entry = devc->channel_entry->next;
- rigol_ds_channel_start(sdi);
+ devc->num_channel_bytes += len;
+
+ if (devc->num_channel_bytes < expected_data_bytes)
+ /* Don't have the full data for this channel yet, re-run. */
+ return TRUE;
+
+ /* End of data for this channel. */
+ if (devc->model->series->protocol == PROTOCOL_V3) {
+ /* Signal end of data download to scope */
+ if (devc->data_source != DATA_SOURCE_LIVE)
+ /*
+ * This causes a query error, without it switching
+ * to the next channel causes an error. Fun with
+ * firmware...
+ */
+ rigol_ds_config_set(sdi, ":WAV:END");
+ }
+
+ if (devc->channel_entry->next) {
+ /* We got the frame for this channel, now get the next channel. */
+ devc->channel_entry = devc->channel_entry->next;
+ rigol_ds_channel_start(sdi);
+ } else {
+ /* Done with this frame. */
+ std_session_send_df_frame_end(sdi);
+
+ 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->data_source == DATA_SOURCE_MEMORY) {
+ /* Last frame, stop capture. */
+ sr_dev_acquisition_stop(sdi);
} else {
- /* Done with all analog channels in this frame. */
- if (devc->enabled_digital_channels
- && devc->channel_entry != devc->enabled_digital_channels) {
- /* Now we need to get the digital data. */
- devc->channel_entry = devc->enabled_digital_channels;
- rigol_ds_channel_start(sdi);
- } else {
- /* Done with this frame. */
- packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
-
- if (++devc->num_frames == devc->limit_frames) {
- /* Last frame, stop capture. */
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- } else {
- /* Get the next frame, starting with the first analog channel. */
- if (devc->enabled_analog_channels)
- devc->channel_entry = devc->enabled_analog_channels;
- else
- devc->channel_entry = devc->enabled_digital_channels;
-
- rigol_ds_capture_start(sdi);
-
- /* Start of next frame. */
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &packet);
- }
- }
+ /* Get the next frame, starting with the first channel. */
+ devc->channel_entry = devc->enabled_channels;
+
+ rigol_ds_capture_start(sdi);
+
+ /* Start of next frame. */
+ std_session_send_df_frame_begin(sdi);
}
}
SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- char *t_s, *cmd;
+ struct sr_channel *ch;
+ char *cmd;
unsigned int i;
int res;
/* Analog channel state. */
for (i = 0; i < devc->model->analog_channels; i++) {
cmd = g_strdup_printf(":CHAN%d:DISP?", i + 1);
- res = sr_scpi_get_string(sdi->conn, cmd, &t_s);
+ res = sr_scpi_get_bool(sdi->conn, cmd, &devc->analog_channels[i]);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- devc->analog_channels[i] = !strcmp(t_s, "ON") || !strcmp(t_s, "1");
+ ch = g_slist_nth_data(sdi->channels, i);
+ ch->enabled = devc->analog_channels[i];
}
sr_dbg("Current analog channel state:");
for (i = 0; i < devc->model->analog_channels; i++)
/* Digital channel state. */
if (devc->model->has_digital) {
- if (sr_scpi_get_string(sdi->conn, ":LA:DISP?", &t_s) != SR_OK)
+ if (sr_scpi_get_bool(sdi->conn,
+ devc->model->series->protocol >= PROTOCOL_V3 ?
+ ":LA:STAT?" : ":LA:DISP?",
+ &devc->la_enabled) != SR_OK)
return SR_ERR;
- devc->la_enabled = !strcmp(t_s, "ON") ? TRUE : FALSE;
sr_dbg("Logic analyzer %s, current digital channel state:",
devc->la_enabled ? "enabled" : "disabled");
for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
- cmd = g_strdup_printf(":DIG%d:TURN?", i);
- res = sr_scpi_get_string(sdi->conn, cmd, &t_s);
+ if (devc->model->series->protocol >= PROTOCOL_V5)
+ cmd = g_strdup_printf(":LA:DISP? D%d", i);
+ else if (devc->model->series->protocol >= PROTOCOL_V3)
+ cmd = g_strdup_printf(":LA:DIG%d:DISP?", i);
+ else
+ cmd = g_strdup_printf(":DIG%d:TURN?", i);
+ res = sr_scpi_get_bool(sdi->conn, cmd, &devc->digital_channels[i]);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- devc->digital_channels[i] = !strcmp(t_s, "ON") ? TRUE : FALSE;
- g_free(t_s);
+ ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels);
+ ch->enabled = devc->digital_channels[i];
sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
}
}
return SR_ERR;
sr_dbg("Current timebase %g", devc->timebase);
- /* Vertical gain. */
+ /* Probe attenuation. */
for (i = 0; i < devc->model->analog_channels; i++) {
- cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
- res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
- g_free(cmd);
+ cmd = g_strdup_printf(":CHAN%d:PROB?", i + 1);
+
+ /* DSO1000B series prints an X after the probe factor, so
+ * we get a string and check for that instead of only handling
+ * floats. */
+ char *response;
+ res = sr_scpi_get_string(sdi->conn, cmd, &response);
if (res != SR_OK)
return SR_ERR;
- }
- sr_dbg("Current vertical gain:");
- for (i = 0; i < devc->model->analog_channels; i++)
- sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
- sr_dbg("Current vertical reference:");
- 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)
- return SR_ERR;
- if (sr_scpi_get_int(sdi->conn, ":WAV:YREF?", &devc->vert_reference[i]) != SR_OK)
- return SR_ERR;
- sr_dbg("CH%d %d", i + 1, devc->vert_reference[i]);
- }
- }
+ int len = strlen(response);
+ if (response[len-1] == 'X')
+ response[len-1] = 0;
- /* Vertical offset. */
- for (i = 0; i < devc->model->analog_channels; i++) {
- cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
- res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
+ res = sr_atof_ascii(response, &devc->attenuation[i]);
+ g_free(response);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
}
- sr_dbg("Current vertical offset:");
+ sr_dbg("Current probe attenuation:");
for (i = 0; i < devc->model->analog_channels; i++)
- sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+ sr_dbg("CH%d %g", i + 1, devc->attenuation[i]);
+
+ /* Vertical gain and offset. */
+ if (rigol_ds_get_dev_cfg_vertical(sdi) != SR_OK)
+ return SR_ERR;
/* Coupling. */
for (i = 0; i < devc->model->analog_channels; i++) {
cmd = g_strdup_printf(":CHAN%d:COUP?", i + 1);
+ g_free(devc->coupling[i]);
+ devc->coupling[i] = NULL;
res = sr_scpi_get_string(sdi->conn, cmd, &devc->coupling[i]);
g_free(cmd);
if (res != SR_OK)
sr_dbg("CH%d %s", i + 1, devc->coupling[i]);
/* Trigger source. */
+ g_free(devc->trigger_source);
+ devc->trigger_source = NULL;
if (sr_scpi_get_string(sdi->conn, ":TRIG:EDGE:SOUR?", &devc->trigger_source) != SR_OK)
return SR_ERR;
sr_dbg("Current trigger source %s", devc->trigger_source);
/* Horizontal trigger position. */
- if (sr_scpi_get_float(sdi->conn, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK)
+ if (sr_scpi_get_float(sdi->conn, devc->model->cmds[CMD_GET_HORIZ_TRIGGERPOS].str,
+ &devc->horiz_triggerpos) != SR_OK)
return SR_ERR;
sr_dbg("Current horizontal trigger position %g", devc->horiz_triggerpos);
/* Trigger slope. */
+ g_free(devc->trigger_slope);
+ devc->trigger_slope = NULL;
if (sr_scpi_get_string(sdi->conn, ":TRIG:EDGE:SLOP?", &devc->trigger_slope) != SR_OK)
return SR_ERR;
sr_dbg("Current trigger slope %s", devc->trigger_slope);
+ /* Trigger level. */
+ if (sr_scpi_get_float(sdi->conn, ":TRIG:EDGE:LEV?", &devc->trigger_level) != SR_OK)
+ return SR_ERR;
+ sr_dbg("Current trigger level %g", devc->trigger_level);
+
+ return SR_OK;
+}
+
+SR_PRIV int rigol_ds_get_dev_cfg_vertical(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ char *cmd;
+ unsigned int i;
+ int res;
+
+ devc = sdi->priv;
+
+ /* Vertical gain. */
+ for (i = 0; i < devc->model->analog_channels; i++) {
+ cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
+ res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
+ g_free(cmd);
+ if (res != SR_OK)
+ return SR_ERR;
+ }
+ sr_dbg("Current vertical gain:");
+ for (i = 0; i < devc->model->analog_channels; i++)
+ sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+
+ /* Vertical offset. */
+ for (i = 0; i < devc->model->analog_channels; i++) {
+ cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
+ res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
+ g_free(cmd);
+ if (res != SR_OK)
+ return SR_ERR;
+ }
+ sr_dbg("Current vertical offset:");
+ for (i = 0; i < devc->model->analog_channels; i++)
+ sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+
return SR_OK;
}
projects / libsigrok.git / blobdiff