X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fprotocol.c;h=942aecfd801efce77a3c4ee886c66ae57605a524;hb=f6beaac55ca58c406d6621038abe57c16a47e87f;hp=19e402c386c4b60aff34c957061b1fd862107ad7;hpb=88e429c97f4fa482f8897c4795ad14f0afa96b56;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/protocol.c b/hardware/rigol-ds1xx2/protocol.c
index 19e402c3..942aecfd 100644
--- a/hardware/rigol-ds1xx2/protocol.c
+++ b/hardware/rigol-ds1xx2/protocol.c
@@ -23,20 +23,27 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <math.h>
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
+SR_PRIV int rigol_ds1xx2_receive(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
+	struct sr_serial_dev_inst *serial;
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
-	unsigned char buf[WAVEFORM_SIZE];
-	float data[WAVEFORM_SIZE];
-	int len, i;
+	struct sr_datafeed_logic logic;
+	unsigned char buf[DIGITAL_WAVEFORM_SIZE];
+	double vdiv, offset;
+	float data[ANALOG_WAVEFORM_SIZE];
+	int len, i, waveform_size;
+	struct sr_probe *probe;
+
+	(void)fd;
 
 	if (!(sdi = cb_data))
 		return TRUE;
@@ -44,65 +51,241 @@ SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
+	serial = sdi->conn;
+
 	if (revents == G_IO_IN) {
-		len = read(fd, buf, WAVEFORM_SIZE);
+		probe = devc->channel_frame;
+		waveform_size = probe->type == SR_PROBE_ANALOG ?
+				ANALOG_WAVEFORM_SIZE : DIGITAL_WAVEFORM_SIZE;
+		len = serial_read(serial, buf, waveform_size - devc->num_frame_bytes);
 		sr_dbg("Received %d bytes.", len);
 		if (len == -1)
 			return TRUE;
 
-		if (devc->num_frame_samples == 0) {
+		if (devc->num_frame_bytes == 0) {
 			/* Start of a new frame. */
 			packet.type = SR_DF_FRAME_BEGIN;
 			sr_session_send(sdi, &packet);
 		}
 
-		for (i = 0; i < len; i++)
-			data[i] = devc->scale / 25.6 * (128 - buf[i]) - devc->offset;
-		analog.probes = devc->enabled_probes;
-		analog.num_samples = len;
-		analog.data = 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);
-
-		if (len == WAVEFORM_SIZE) {
-			/* End of the frame. */
-			packet.type = SR_DF_FRAME_END;
-			sr_session_send(sdi, &packet);
+		if (probe->type == SR_PROBE_ANALOG) {
+			for (i = 0; i < len; i++) {
+				vdiv = devc->vdiv[probe->index];
+				offset = devc->vert_offset[probe->index];
+				data[i] = vdiv / 25.6 * (128 - buf[i]) - offset;
+			}
+			analog.probes = g_slist_append(NULL, probe);
+			analog.num_samples = len;
+			analog.data = 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.probes);
+
+			if (len != ANALOG_WAVEFORM_SIZE)
+				/* Don't have the whole frame yet. */
+				return TRUE;
+		} else {
+			logic.length = len - 10;
+			logic.unitsize = 2;
+			logic.data = buf + 10;
+			packet.type = SR_DF_LOGIC;
+			packet.payload = &logic;
+			sr_session_send(cb_data, &packet);
+
+			if (len != DIGITAL_WAVEFORM_SIZE)
+				/* Don't have the whole frame yet. */
+				return TRUE;
+		}
 
-			if (++devc->num_frames == devc->limit_frames)
+		/* End of the frame. */
+		packet.type = SR_DF_FRAME_END;
+		sr_session_send(sdi, &packet);
+		devc->num_frame_bytes = 0;
+
+		if (devc->enabled_analog_probes
+				&& devc->channel_frame == devc->enabled_analog_probes->data
+				&& devc->enabled_analog_probes->next != NULL) {
+			/* We got the frame for the first analog channel, but
+			 * there's a second analog channel. */
+			devc->channel_frame = devc->enabled_analog_probes->next->data;
+			rigol_ds1xx2_send(sdi, ":WAV:DATA? CHAN%c",
+					devc->channel_frame->name[2]);
+		} else {
+			/* Done with both analog channels in this frame. */
+			if (devc->enabled_digital_probes
+					&& devc->channel_frame != devc->enabled_digital_probes->data) {
+				/* Now we need to get the digital data. */
+				devc->channel_frame = devc->enabled_digital_probes->data;
+				rigol_ds1xx2_send(sdi, ":WAV:DATA? DIG");
+			} else if (++devc->num_frames == devc->limit_frames) {
+				/* End of last frame. */
 				sdi->driver->dev_acquisition_stop(sdi, cb_data);
-			else
-				rigol_ds1xx2_send_data(fd, ":WAV:DATA?");
+			} else {
+				/* Get the next frame, starting with the first analog channel. */
+				if (devc->enabled_analog_probes) {
+					devc->channel_frame = devc->enabled_analog_probes->data;
+					rigol_ds1xx2_send(sdi, ":WAV:DATA? CHAN%c",
+							devc->channel_frame->name[2]);
+				} else {
+					devc->channel_frame = devc->enabled_digital_probes->data;
+					rigol_ds1xx2_send(sdi, ":WAV:DATA? DIG");
+				}
+			}
 		}
 	}
 
 	return TRUE;
 }
 
-SR_PRIV int rigol_ds1xx2_send_data(int fd, const char *format, ...)
+SR_PRIV int rigol_ds1xx2_send(const struct sr_dev_inst *sdi, const char *format, ...)
 {
 	va_list args;
 	char buf[256];
 	int len, out, ret;
 
 	va_start(args, format);
-	len = vsprintf(buf, format, args);
+	len = vsnprintf(buf, 255, format, args);
 	va_end(args);
 	strcat(buf, "\n");
 	len++;
-	out = write(fd, buf, len);
+	out = serial_write(sdi->conn, buf, len);
 	buf[len - 1] = '\0';
 	if (out != len) {
 		sr_dbg("Only sent %d/%d bytes of '%s'.", out, len, buf);
 		ret = SR_ERR;
 	} else {
-		sr_dbg("Sent '%s'.", buf);
+		sr_spew("Sent '%s'.", buf);
 		ret = SR_OK;
 	}
 
 	return ret;
 }
+
+static int get_cfg(const struct sr_dev_inst *sdi, char *cmd, char *reply)
+{
+	int len;
+
+	if (rigol_ds1xx2_send(sdi, cmd) != SR_OK)
+		return SR_ERR;
+
+	if ((len = serial_read(sdi->conn, reply, 255)) < 0)
+		return SR_ERR;
+	reply[len] = '\0';
+	sr_spew("Received '%s'.", reply);
+
+	return SR_OK;
+}
+
+static int get_cfg_float(const struct sr_dev_inst *sdi, char *cmd, float *f)
+{
+	char buf[256], *e;
+
+	if (get_cfg(sdi, cmd, buf) != SR_OK)
+		return SR_ERR;
+	*f = strtof(buf, &e);
+	if (e == buf || (fpclassify(*f) & (FP_ZERO | FP_NORMAL)) == 0) {
+		sr_dbg("failed to parse response to '%s': '%s'", cmd, buf);
+		return SR_ERR;
+	}
+
+	return SR_OK;
+}
+
+static int get_cfg_string(const struct sr_dev_inst *sdi, char *cmd, char **buf)
+{
+
+	if (!(*buf = g_try_malloc0(256)))
+		return SR_ERR_MALLOC;
+
+	if (get_cfg(sdi, cmd, *buf) != SR_OK)
+		return SR_ERR;
+
+	return SR_OK;
+}
+
+SR_PRIV int rigol_ds1xx2_get_dev_cfg(const struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	char *t_s, *cmd;
+	int i, res;
+
+	devc = sdi->priv;
+
+	/* Analog channel state. */
+	if (get_cfg_string(sdi, ":CHAN1:DISP?", &t_s) != SR_OK)
+		return SR_ERR;
+	devc->analog_channels[0] = !strcmp(t_s, "ON") ? TRUE : FALSE;
+	g_free(t_s);
+	if (get_cfg_string(sdi, ":CHAN2:DISP?", &t_s) != SR_OK)
+		return SR_ERR;
+	devc->analog_channels[1] = !strcmp(t_s, "ON") ? TRUE : FALSE;
+	g_free(t_s);
+	sr_dbg("Current analog channel state CH1 %s CH2 %s",
+			devc->analog_channels[0] ? "on" : "off",
+			devc->analog_channels[1] ? "on" : "off");
+
+	/* Digital channel state. */
+	if (devc->has_digital) {
+		sr_dbg("Current digital channel state:");
+		for (i = 0; i < 16; i++) {
+			cmd = g_strdup_printf(":DIG%d:TURN?", i);
+			res = get_cfg_string(sdi, cmd, &t_s);
+			g_free(cmd);
+			if (res != SR_OK)
+				return SR_ERR;
+			devc->digital_channels[i] = !strcmp(t_s, "ON") ? TRUE : FALSE;
+			g_free(t_s);
+			sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
+		}
+	}
+
+	/* Timebase. */
+	if (get_cfg_float(sdi, ":TIM:SCAL?", &devc->timebase) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current timebase %f", devc->timebase);
+
+	/* Vertical gain. */
+	if (get_cfg_float(sdi, ":CHAN1:SCAL?", &devc->vdiv[0]) != SR_OK)
+		return SR_ERR;
+	if (get_cfg_float(sdi, ":CHAN2:SCAL?", &devc->vdiv[1]) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current vertical gain CH1 %f CH2 %f", devc->vdiv[0], devc->vdiv[1]);
+
+	/* Vertical offset. */
+	if (get_cfg_float(sdi, ":CHAN1:OFFS?", &devc->vert_offset[0]) != SR_OK)
+		return SR_ERR;
+	if (get_cfg_float(sdi, ":CHAN2:OFFS?", &devc->vert_offset[1]) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current vertical offset CH1 %f CH2 %f", devc->vert_offset[0],
+			devc->vert_offset[1]);
+
+	/* Coupling. */
+	if (get_cfg_string(sdi, ":CHAN1:COUP?", &devc->coupling[0]) != SR_OK)
+		return SR_ERR;
+	if (get_cfg_string(sdi, ":CHAN2:COUP?", &devc->coupling[1]) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current coupling CH1 %s CH2 %s", devc->coupling[0],
+			devc->coupling[1]);
+
+	/* Trigger source. */
+	if (get_cfg_string(sdi, ":TRIG:EDGE:SOUR?", &devc->trigger_source) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current trigger source %s", devc->trigger_source);
+
+	/* Horizontal trigger position. */
+	if (get_cfg_float(sdi, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current horizontal trigger position %f", devc->horiz_triggerpos);
+
+	/* Trigger slope. */
+	if (get_cfg_string(sdi, ":TRIG:EDGE:SLOP?", &devc->trigger_slope) != SR_OK)
+		return SR_ERR;
+	sr_dbg("Current trigger slope %s", devc->trigger_slope);
+
+	return SR_OK;
+}
+