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

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index ecdf40e5..b6e60b96 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -2,6 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,46 +25,18 @@
 #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 = sr_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;
+	const struct scpi_pps *device;
 	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_dev_inst *sdi;
+	int channel_group_cmd;
+	const char *channel_group_name;
 	struct pps_channel *pch;
 	const struct channel_spec *ch_spec;
 	int ret;
@@ -81,7 +54,27 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
-	pch = devc->cur_channel->priv;
+	if (!(device = devc->device))
+		return TRUE;
+
+	pch = devc->cur_acquisition_channel->priv;
+
+	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 = pch->hwname;
+	}
+
+	/*
+	 * When the current channel is the first in the array, perform the device
+	 * specific status update first.
+	 */
+	if (devc->cur_acquisition_channel == sr_next_enabled_channel(sdi, NULL) &&
+		device->update_status) {
+		device->update_status(sdi);
+	}
+
 	if (pch->mq == SR_MQ_VOLTAGE) {
 		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
@@ -98,9 +91,9 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 		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);
+	ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+		channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd);
+
 	if (ret != SR_OK)
 		return ret;
 
@@ -109,9 +102,10 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	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.meaning->channels = g_slist_append(NULL, devc->cur_acquisition_channel);
 	analog.num_samples = 1;
 	analog.meaning->mq = pch->mq;
+	analog.meaning->mqflags = pch->mqflags;
 	if (pch->mq == SR_MQ_VOLTAGE) {
 		analog.meaning->unit = SR_UNIT_VOLT;
 		analog.encoding->digits = ch_spec->voltage[4];
@@ -125,19 +119,25 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 		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);
+	g_variant_unref(gvdata);
 	analog.data = &f;
 	sr_session_send(sdi, &packet);
 	g_slist_free(analog.meaning->channels);
 
+	/* Next channel. */
 	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;
-		}
+		devc->cur_acquisition_channel =
+			sr_next_enabled_channel(sdi, devc->cur_acquisition_channel);
 	}
 
+	if (devc->cur_acquisition_channel == sr_next_enabled_channel(sdi, NULL))
+		/* First enabled channel, so each channel has been sampled */
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+	/* Stop if limits have been hit. */
+	if (sr_sw_limits_check(&devc->limits))
+		sr_dev_acquisition_stop(sdi);
+
 	return TRUE;
 }