X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=ecdf40e598aae48cbdd37fe41ae39553d61711c5;hb=fa2ce8c762fb62cd632eb2a8b4f24128ca742678;hp=c4b73add15b3dec0605caf67aa766efa218f825a;hpb=91ef511db2370904f8765a13e315fbddaf5ffe07;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index c4b73add..ecdf40e5 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <strings.h>
 #include <stdarg.h>
@@ -46,41 +47,29 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 		}
 	}
 
-	if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+	if ((ret = sr_scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
 			new_pch->hwname)) >= 0)
 		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;
+	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;
 	struct pps_channel *pch;
+	const struct channel_spec *ch_spec;
+	int ret;
 	float f;
+	GVariant *gvdata;
+	const GVariantType *gvtype;
 	int cmd;
 
 	(void)fd;
@@ -92,48 +81,63 @@ 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);
+	pch = devc->cur_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) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
+		cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
+	} 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) {
+		gvtype = G_VARIANT_TYPE_DOUBLE;
+		cmd = SCPI_CMD_GET_MEAS_POWER;
+	} else {
+		return SR_ERR;
+	}
+
+	//sr_scpi_cmd(sdi, devc->device->commands, cmd, pch->hwname); <- api.c 1x called
+	//sr_scpi_cmd(sdi, devc->device->commands, cmd); <- protocol.c xx called
+	ret = sr_scpi_cmd_resp(sdi, devc->device->commands, &gvdata, gvtype, cmd);
+	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_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);
 
 	if (g_slist_length(sdi->channels) > 1) {
-		next_channel = next_enabled_channel(sdi, devc->cur_channel);
+		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;
 		}
 	}
 
-	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, devc->device->commands, cmd);
-
 	return TRUE;
 }