X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fprotocol.c;h=c11006b37812f93c26ce784c42d6a82d144de3cf;hb=0bdb4f2e4aae1f9589897fc4b47cd012e9a25e49;hp=d95716d7a59e3abef63dc487e7f40501adeac3b9;hpb=169dbe8577c2f7570f61799a064f95b39b3b6fe3;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/protocol.c b/hardware/rigol-ds1xx2/protocol.c
index d95716d7..c11006b3 100644
--- a/hardware/rigol-ds1xx2/protocol.c
+++ b/hardware/rigol-ds1xx2/protocol.c
@@ -32,13 +32,18 @@
 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];
+	struct sr_datafeed_logic logic;
+	unsigned char buf[DIGITAL_WAVEFORM_SIZE];
 	double vdiv, offset;
-	float data[WAVEFORM_SIZE];
-	int probenum, len, i;
+	float data[ANALOG_WAVEFORM_SIZE];
+	int len, i, waveform_size;
+	struct sr_probe *probe;
+
+	(void) fd;
 
 	if (!(sdi = cb_data))
 		return TRUE;
@@ -46,59 +51,89 @@ SR_PRIV int rigol_ds1xx2_receive(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);
 		}
 
-		probenum = devc->channel_frame->name[2] == '1' ? 0 : 1;
-		for (i = 0; i < len; i++) {
-			vdiv = devc->vdiv[probenum];
-			offset = devc->vert_offset[probenum];
-			data[i] = vdiv / 25.6 * (128 - buf[i]) - offset;
+		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;
 		}
-		analog.probes = g_slist_append(NULL, devc->channel_frame);
-		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 != WAVEFORM_SIZE)
-			/* Don't have the whole frame yet. */
-			return TRUE;
 
 		/* End of the frame. */
 		packet.type = SR_DF_FRAME_END;
 		sr_session_send(sdi, &packet);
-
-		if (devc->channel_frame == devc->enabled_probes->data
-				&& devc->enabled_probes->next != NULL) {
-			/* We got the frame for the first channel, but
-			 * there's a second channel. */
-			devc->channel_frame = devc->enabled_probes->next->data;
-			rigol_ds1xx2_send(devc, ":WAV:DATA? CHAN%c",
+		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 channels in this frame. */
-			if (++devc->num_frames == devc->limit_frames) {
+			/* 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 {
-				/* Get the next frame, starting with the first channel. */
-				devc->channel_frame = devc->enabled_probes->data;
-				rigol_ds1xx2_send(devc, ":WAV:DATA? CHAN%c",
-						devc->channel_frame->name[2]);
+				/* 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");
+				}
 			}
 		}
 	}
@@ -106,7 +141,7 @@ SR_PRIV int rigol_ds1xx2_receive(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-SR_PRIV int rigol_ds1xx2_send(struct dev_context *devc, const char *format, ...)
+SR_PRIV int rigol_ds1xx2_send(const struct sr_dev_inst *sdi, const char *format, ...)
 {
 	va_list args;
 	char buf[256];
@@ -117,7 +152,7 @@ SR_PRIV int rigol_ds1xx2_send(struct dev_context *devc, const char *format, ...)
 	va_end(args);
 	strcat(buf, "\n");
 	len++;
-	out = write(devc->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);
@@ -132,15 +167,12 @@ SR_PRIV int rigol_ds1xx2_send(struct dev_context *devc, const char *format, ...)
 
 static int get_cfg(const struct sr_dev_inst *sdi, char *cmd, char *reply)
 {
-	struct dev_context *devc;
 	int len;
 
-	devc = sdi->priv;
-
-	if (rigol_ds1xx2_send(devc, cmd) != SR_OK)
+	if (rigol_ds1xx2_send(sdi, cmd) != SR_OK)
 		return SR_ERR;
 
-	if ((len = read(devc->fd, reply, 255)) < 0)
+	if ((len = serial_read(sdi->conn, reply, 255)) < 0)
 		return SR_ERR;
 	reply[len] = '\0';
 	sr_spew("Received '%s'.", reply);
@@ -178,22 +210,38 @@ static int get_cfg_string(const struct sr_dev_inst *sdi, char *cmd, char **buf)
 SR_PRIV int rigol_ds1xx2_get_dev_cfg(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	char *t_s;
+	char *t_s, *cmd;
+	int i, res;
 
 	devc = sdi->priv;
 
-	/* Channel state. */
+	/* Analog channel state. */
 	if (get_cfg_string(sdi, ":CHAN1:DISP?", &t_s) != SR_OK)
 		return SR_ERR;
-	devc->channels[0] = !strcmp(t_s, "ON") ? TRUE : FALSE;
+	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->channels[1] = !strcmp(t_s, "ON") ? TRUE : FALSE;
+	devc->analog_channels[1] = !strcmp(t_s, "ON") ? TRUE : FALSE;
 	g_free(t_s);
-	sr_dbg("Current channel state CH1 %s CH2 %s",
-			devc->channels[0] ? "on" : "off",
-			devc->channels[1] ? "on" : "off");
+	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)