X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=8dd669722d776e6a47c8588cafc48979ed3884a0;hb=17a82e83ff4c2a7dc1bcc4f5ab6197c16a3b72de;hp=e9209b3e58237282905844a965d9eed98f435c65;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index e9209b3e..8dd66972 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -24,46 +24,23 @@
 #include "scpi.h"
 #include "protocol.h"
 
-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, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
-			new_pch->hwname)) >= 0)
-		devc->cur_channel = ch;
-
-	return ret;
-}
-
 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;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	const struct sr_dev_inst *sdi;
-	struct sr_channel *next_channel;
-	struct sr_scpi_dev_inst *scpi;
+	int channel_group_cmd;
+	char *channel_group_name;
 	struct pps_channel *pch;
+	const struct channel_spec *ch_spec;
+	int ret;
 	float f;
+	GVariant *gvdata;
+	const GVariantType *gvtype;
 	int cmd;
 
 	(void)fd;
@@ -75,48 +52,69 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	if (!(devc = sdi->priv))
 		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;
-		analog.mq = pch->mq;
-		if (pch->mq == SR_MQ_VOLTAGE)
-			analog.unit = SR_UNIT_VOLT;
-		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 (g_slist_length(sdi->channels) > 1) {
-		next_channel = sr_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;
-		}
+	channel_group_cmd = 0;
+	channel_group_name = NULL;
+	if (g_slist_length(sdi->channel_groups) > 1) {
+		channel_group_cmd = SCPI_CMD_SELECT_CHANNEL;
+		channel_group_name = g_strdup(devc->cur_acquisition_channel->name);
 	}
 
-	pch = devc->cur_channel->priv;
-	if (pch->mq == SR_MQ_VOLTAGE)
+	pch = devc->cur_acquisition_channel->priv;
+	if (pch->mq == SR_MQ_VOLTAGE) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
-	else if (pch->mq == SR_MQ_FREQUENCY)
+	} else if (pch->mq == SR_MQ_FREQUENCY) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
-	else if (pch->mq == SR_MQ_CURRENT)
+	} else if (pch->mq == SR_MQ_CURRENT) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_MEAS_CURRENT;
-	else if (pch->mq == SR_MQ_POWER)
+	} else if (pch->mq == SR_MQ_POWER) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_MEAS_POWER;
-	else
+	} else {
 		return SR_ERR;
-	scpi_cmd(sdi, devc->device->commands, cmd);
+	}
+
+	ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+		channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd);
+	g_free(channel_group_name);
+
+	if (ret != SR_OK)
+		return ret;
+
+	ch_spec = &devc->device->channels[pch->hw_output_idx];
+	packet.type = SR_DF_ANALOG;
+	packet.payload = &analog;
+	/* Note: digits/spec_digits will be overridden later. */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+	analog.meaning->channels = g_slist_append(NULL, devc->cur_acquisition_channel);
+	analog.num_samples = 1;
+	analog.meaning->mq = pch->mq;
+	if (pch->mq == SR_MQ_VOLTAGE) {
+		analog.meaning->unit = SR_UNIT_VOLT;
+		analog.encoding->digits = ch_spec->voltage[4];
+		analog.spec->spec_digits = ch_spec->voltage[3];
+	} else if (pch->mq == SR_MQ_CURRENT) {
+		analog.meaning->unit = SR_UNIT_AMPERE;
+		analog.encoding->digits = ch_spec->current[4];
+		analog.spec->spec_digits = ch_spec->current[3];
+	} else if (pch->mq == SR_MQ_POWER) {
+		analog.meaning->unit = SR_UNIT_WATT;
+		analog.encoding->digits = ch_spec->power[4];
+		analog.spec->spec_digits = ch_spec->power[3];
+	}
+	analog.meaning->mqflags = SR_MQFLAG_DC;
+	f = (float)g_variant_get_double(gvdata);
+	analog.data = &f;
+	sr_session_send(sdi, &packet);
+	g_slist_free(analog.meaning->channels);
+
+	/* Next channel. */
+	if (g_slist_length(sdi->channels) > 1) {
+		devc->cur_acquisition_channel =
+			sr_next_enabled_channel(sdi, devc->cur_acquisition_channel);
+	}
 
 	return TRUE;
 }