X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=26ff82163a744aa205a6573005971dee8bd10583;hb=4264f1c03b3cd0e7d2634e207c79b1973789af28;hp=667ce46ae29242d7546fa8e831cd3d1a9f2a44d7;hpb=60475cd78820ede32383cc838326d691bb364b07;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 667ce46a..26ff8216 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -18,14 +18,15 @@
  */
 
 #include <string.h>
+#include <strings.h>
 #include <stdarg.h>
 #include "protocol.h"
 
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
+SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
 {
 	struct dev_context *devc;
 	unsigned int i;
-	char *cmd;
+	const char *cmd;
 
 	devc = sdi->priv;
 	cmd = NULL;
@@ -44,7 +45,7 @@ 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;
+	const char *cmd;
 
 	if (!(cmd = scpi_cmd_get(sdi, command))) {
 		/* Device does not implement this command, that's OK. */
@@ -66,7 +67,8 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
 	va_list args;
 	double d;
 	int ret;
-	char *cmd, *s;
+	char *s;
+	const char *cmd;
 
 	if (!(cmd = scpi_cmd_get(sdi, command))) {
 		/* Device does not implement this command, that's OK. */
@@ -80,21 +82,45 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
 	if (ret != SR_OK)
 		return ret;
 
-	if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
+	/* 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 (!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;
-	} 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);
+		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;
@@ -103,7 +129,7 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
 SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 {
 	struct dev_context *devc;
-	struct pps_channel *pch;
+	struct pps_channel *cur_pch, *new_pch;
 	int ret;
 
 	if (g_slist_length(sdi->channels) == 1)
@@ -113,13 +139,40 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 	if (ch == devc->cur_channel)
 		return SR_OK;
 
-	pch = ch->priv;
-	if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, pch->hwname)) == 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;
@@ -129,7 +182,6 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	struct sr_channel *next_channel;
 	struct sr_scpi_dev_inst *scpi;
 	struct pps_channel *pch;
-	GSList *l;
 	float f;
 	int cmd;
 
@@ -165,17 +217,8 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	}
 
 	if (g_slist_length(sdi->channels) > 1) {
-		/* Find next enabled channel. */
-		next_channel = devc->cur_channel;
-		do {
-			l = g_slist_find(sdi->channels, next_channel);
-			if (l->next)
-				next_channel = l->next->data;
-			else
-				next_channel = sdi->channels->data;
-		} while (!next_channel->enabled);
-		select_channel(sdi, next_channel);
-		if (devc->cur_channel != next_channel) {
+		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;
 		}
@@ -184,13 +227,15 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	pch = devc->cur_channel->priv;
 	if (pch->mq == SR_MQ_VOLTAGE)
 		cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+	else if (pch->mq == SR_MQ_FREQUENCY)
+		cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
 	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, pch->hwname);
+	scpi_cmd(sdi, cmd);
 
 	return TRUE;
 }