X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=a27089f52a7981f1b936ee2c46599abede38dd3e;hb=815e3cb83e715fad442c491d406f6ceba79e3a74;hp=13133b5b8c5808ad459d9d7b653dc79369b2e35a;hpb=624503ae90a3583edd34fc28a62a037640984e36;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 13133b5b..a27089f5 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;
@@ -123,7 +149,7 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 		}
 	}
 
-	if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, new_pch->hwname)) == SR_OK)
+	if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, new_pch->hwname)) >= 0)
 		devc->cur_channel = ch;
 
 	return ret;
@@ -201,6 +227,8 @@ 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)