X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=86ec387693a4d3b58072643a752dd6b60526116d;hb=bff16ba817a5609e91ca803892354ab7dbc396df;hp=b6049dc3f75c925e141db3e46c2e1924b3244c6d;hpb=9e45cd41fd1618238c8a3afc56d4031c984bc3c5;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index b6049dc3..86ec3876 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -21,13 +21,10 @@
 #include <stdarg.h>
 #include "protocol.h"
 
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
+SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
 {
-	va_list args;
 	struct dev_context *devc;
-	struct sr_scpi_dev_inst *scpi;
 	unsigned int i;
-	int ret;
 	char *cmd;
 
 	devc = sdi->priv;
@@ -38,7 +35,18 @@ SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
 			break;
 		}
 	}
-	if (!cmd) {
+
+	return cmd;
+}
+
+SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
+{
+	struct sr_scpi_dev_inst *scpi;
+	va_list args;
+	int ret;
+	char *cmd;
+
+	if (!(cmd = scpi_cmd_get(sdi, command))) {
 		/* Device does not implement this command, that's OK. */
 		return SR_OK_CONTINUE;
 	}
@@ -51,15 +59,129 @@ SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
 	return ret;
 }
 
+SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
+		const GVariantType *gvtype, int command, ...)
+{
+	struct sr_scpi_dev_inst *scpi;
+	va_list args;
+	double d;
+	int ret;
+	char *cmd, *s;
+
+	if (!(cmd = scpi_cmd_get(sdi, command))) {
+		/* Device does not implement this command, that's OK. */
+		return SR_OK_CONTINUE;
+	}
+
+	scpi = sdi->conn;
+	va_start(args, command);
+	ret = sr_scpi_send_variadic(scpi, cmd, args);
+	va_end(args);
+	if (ret != SR_OK)
+		return ret;
+
+	/* Non-standard data type responses. */
+	if (command == SCPI_CMD_GET_OUTPUT_REGULATION) {
+		/*
+		 * The Rigol DP800 series return CV/CC/UR, Philips PM2800
+		 * return VOLT/CURR. We always return a GVariant string in
+		 * the Rigol notation.
+		 */
+		if ((ret = sr_scpi_get_string(scpi, NULL, &s)) != SR_OK)
+			return ret;
+		if (!strcmp(s, "CV") || !strcmp(s, "VOLT")) {
+			*gvar = g_variant_new_string("CV");
+		} else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) {
+			*gvar = g_variant_new_string("CC");
+		} else if (!strcmp(s, "UR")) {
+			*gvar = g_variant_new_string("UR");
+		} else {
+			sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
+			ret = SR_ERR_DATA;
+		}
+		g_free(s);
+	} else {
+		/* Straight SCPI getters to GVariant types. */
+		if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
+			if ((ret = sr_scpi_get_string(scpi, NULL, &s)) != SR_OK)
+				return ret;
+			if (!strcasecmp(s, "ON") || !strcasecmp(s, "1") || !strcasecmp(s, "YES"))
+				*gvar = g_variant_new_boolean(TRUE);
+			else if (!strcasecmp(s, "OFF") || !strcasecmp(s, "0") || !strcasecmp(s, "NO"))
+				*gvar = g_variant_new_boolean(FALSE);
+			else
+				ret = SR_ERR;
+			g_free(s);
+		} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
+			if ((ret = sr_scpi_get_double(scpi, NULL, &d)) == SR_OK)
+				*gvar = g_variant_new_double(d);
+		} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
+			if ((ret = sr_scpi_get_string(scpi, NULL, &s)) == SR_OK)
+				*gvar = g_variant_new_string(s);
+		}
+	}
+
+	return ret;
+}
+
+SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
+{
+	struct dev_context *devc;
+	struct pps_channel *cur_pch, *new_pch;
+	int ret;
+
+	if (g_slist_length(sdi->channels) == 1)
+		return SR_OK;
+
+	devc = sdi->priv;
+	if (ch == devc->cur_channel)
+		return SR_OK;
+
+	new_pch = ch->priv;
+	if (devc->cur_channel) {
+		cur_pch = devc->cur_channel->priv;
+		if (cur_pch->hw_output_idx == new_pch->hw_output_idx) {
+			/* Same underlying output channel. */
+			devc->cur_channel = ch;
+			return SR_OK;
+		}
+	}
+
+	if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, new_pch->hwname)) == SR_OK)
+		devc->cur_channel = ch;
+
+	return ret;
+}
+
+SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
+		struct sr_channel *cur_channel)
+{
+	struct sr_channel *next_channel;
+	GSList *l;
+
+	next_channel = cur_channel;
+	do {
+		l = g_slist_find(sdi->channels, next_channel);
+		if (l && l->next)
+			next_channel = l->next->data;
+		else
+			next_channel = sdi->channels->data;
+	} while (!next_channel->enabled);
+
+	return next_channel;
+}
+
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
 	const struct sr_dev_inst *sdi;
+	struct sr_channel *next_channel;
 	struct sr_scpi_dev_inst *scpi;
-	GSList *l;
+	struct pps_channel *pch;
 	float f;
+	int cmd;
 
 	(void)fd;
 	(void)revents;
@@ -70,51 +192,46 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
-	if (devc->state == STATE_STOP)
-		return TRUE;
-
 	scpi = sdi->conn;
 
 	/* Retrieve requested value for this state. */
 	if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
+		pch = devc->cur_channel->priv;
 		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
 		analog.channels = g_slist_append(NULL, devc->cur_channel);
 		analog.num_samples = 1;
-		if (devc->state == STATE_VOLTAGE) {
-			analog.mq = SR_MQ_VOLTAGE;
+		analog.mq = pch->mq;
+		if (pch->mq == SR_MQ_VOLTAGE)
 			analog.unit = SR_UNIT_VOLT;
-		} else {
-			analog.mq = SR_MQ_CURRENT;
+		else if (pch->mq == SR_MQ_CURRENT)
 			analog.unit = SR_UNIT_AMPERE;
-		}
+		else if (pch->mq == SR_MQ_POWER)
+			analog.unit = SR_UNIT_WATT;
 		analog.mqflags = SR_MQFLAG_DC;
 		analog.data = &f;
 		sr_session_send(sdi, &packet);
 		g_slist_free(analog.channels);
 	}
 
-	if (devc->state == STATE_VOLTAGE) {
-		/* Just got voltage, request current for this channel. */
-		devc->state = STATE_CURRENT;
-		scpi_cmd(sdi, SCPI_CMD_GET_MEAS_CURRENT, devc->cur_channel->name);
-	} else if (devc->state == STATE_CURRENT) {
-		/*
-		 * Done with voltage and current for this channel, switch to
-		 * the next enabled channel.
-		 */
-		do {
-			l = g_slist_find(sdi->channels, devc->cur_channel);
-			if (l->next)
-				devc->cur_channel = l->next->data;
-			else
-				devc->cur_channel = sdi->channels->data;
-		} while (!devc->cur_channel->enabled);
-
-		/* Request voltage. */
-		devc->state = STATE_VOLTAGE;
-		scpi_cmd(sdi, SCPI_CMD_GET_MEAS_VOLTAGE, devc->cur_channel->name);
+	if (g_slist_length(sdi->channels) > 1) {
+		next_channel = next_enabled_channel(sdi, devc->cur_channel);
+		if (select_channel(sdi, next_channel) != SR_OK) {
+			sr_err("Failed to select channel %s", next_channel->name);
+			return FALSE;
+		}
 	}
 
+	pch = devc->cur_channel->priv;
+	if (pch->mq == SR_MQ_VOLTAGE)
+		cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+	else if (pch->mq == SR_MQ_CURRENT)
+		cmd = SCPI_CMD_GET_MEAS_CURRENT;
+	else if (pch->mq == SR_MQ_POWER)
+		cmd = SCPI_CMD_GET_MEAS_POWER;
+	else
+		return SR_ERR;
+	scpi_cmd(sdi, cmd);
+
 	return TRUE;
 }