X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=0a60957cf1eff338b3deeea18ee35e3ac8885e01;hb=934cf6cf5078f01517da303f21ed2ffee9b878f3;hp=3fbf3d721d1dd7220ae9edbf0fec54c9af11a726;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 3fbf3d72..0a60957c 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -28,8 +29,9 @@
 #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"
 
 /*
@@ -327,7 +329,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 	if (!(devc = sdi->priv))
 		return SR_ERR;
 
-	sr_dbg("Starting data capture for frameset %lu of %lu",
+	sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64,
 	       devc->num_frames + 1, devc->limit_frames);
 
 	switch (devc->model->series->protocol) {
@@ -415,8 +417,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 
 	sr_dbg("Starting reading data from channel %d", ch->index + 1);
 
-	switch (devc->model->series->protocol)
-	{
+	switch (devc->model->series->protocol) {
 	case PROTOCOL_V1:
 	case PROTOCOL_V2:
 		if (ch->type == SR_CHANNEL_LOGIC) {
@@ -539,6 +540,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	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;
 	int len, i, vref;
@@ -555,204 +559,207 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
 	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;
+
+	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;
-
-		expected_data_bytes = ch->type == SR_CHANNEL_ANALOG ?
-				devc->analog_frame_size : devc->digital_frame_size;
+		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;
+	}
 
-		if (devc->num_block_bytes == 0) {
-			if (devc->model->series->protocol >= PROTOCOL_V4) {
-				if (sr_scpi_send(sdi->conn, ":WAV:START %d",
-						devc->num_channel_bytes + 1) != SR_OK)
-					return TRUE;
-				if (sr_scpi_send(sdi->conn, ":WAV:STOP %d",
-						MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE,
-							devc->analog_frame_size)) != SR_OK)
-					return TRUE;
-			}
+	ch = devc->channel_entry->data;
 
-			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 (sr_scpi_send(sdi->conn, ":WAV:START %d",
+					devc->num_channel_bytes + 1) != SR_OK)
+				return TRUE;
+			if (sr_scpi_send(sdi->conn, ":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 (devc->model->series->protocol >= PROTOCOL_V3)
+			if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
+				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);
+		if (sr_scpi_read_begin(scpi) != 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;
-			// 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(cb_data, &packet);
-		}
 
-		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) {
-				/* 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");
+		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);
+				sr_session_send(sdi, &packet);
+				sdi->driver->dev_acquisition_stop(sdi);
+				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_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);
 
-		/* End of data for this channel. */
-		if (devc->model->series->protocol == PROTOCOL_V3) {
-			/* Signal end of data download to scope */
+	if (len == -1) {
+		sr_err("Read error, aborting capture.");
+		packet.type = SR_DF_FRAME_END;
+		sr_session_send(sdi, &packet);
+		sdi->driver->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->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;
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+		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);
+	}
+
+	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) {
+			/* 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 (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. */
+		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);
+			sr_session_send(sdi, &packet);
+			sdi->driver->dev_acquisition_stop(sdi);
+			return TRUE;
+		}
+		devc->num_block_read = 0;
+	} else {
+		sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+			devc->num_block_read, devc->num_block_bytes);
+	}
 
-			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 channel. */
-				devc->channel_entry = devc->enabled_channels;
+	devc->num_channel_bytes += len;
 
-				rigol_ds_capture_start(sdi);
+	if (devc->num_channel_bytes < expected_data_bytes)
+		/* Don't have the full data for this channel yet, re-run. */
+		return TRUE;
 
-				/* Start of next frame. */
-				packet.type = SR_DF_FRAME_BEGIN;
-				sr_session_send(cb_data, &packet);
-			}
+	/* 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. */
+		packet.type = SR_DF_FRAME_END;
+		sr_session_send(sdi, &packet);
+
+		if (++devc->num_frames == devc->limit_frames) {
+			/* Last frame, stop capture. */
+			sdi->driver->dev_acquisition_stop(sdi);
+		} else {
+			/* Get the next frame, starting with the first channel. */
+			devc->channel_entry = devc->enabled_channels;
+
+			rigol_ds_capture_start(sdi);
+
+			/* Start of next frame. */
+			packet.type = SR_DF_FRAME_BEGIN;
+			sr_session_send(sdi, &packet);
 		}
 	}
 
@@ -806,29 +813,21 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 		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]);
+		cmd = g_strdup_printf(":CHAN%d:PROB?", i + 1);
+		res = sr_scpi_get_float(sdi->conn, cmd, &devc->attenuation[i]);
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
 	}
-	sr_dbg("Current vertical gain:");
+	sr_dbg("Current probe attenuation:");
 	for (i = 0; i < devc->model->analog_channels; i++)
-		sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+		sr_dbg("CH%d %g", i + 1, devc->attenuation[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]);
+	/* 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++) {
@@ -859,3 +858,39 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 
 	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;
+}